From 031fc31fc4e469d96de8827a758ba4d616297efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Wed, 28 Feb 2024 18:05:26 +0100 Subject: [PATCH 1/4] Upgrade versions --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 340c444..c9d0c18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,9 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \ --no-plugins --no-scripts --prefer-dist # Prepare generic compiler -FROM php:8.1.25-cli-alpine3.16 as compile +FROM php:8.3.3-cli-alpine3.19 as compile -ENV PHP_SWOOLE_VERSION="v5.1.0" \ +ENV PHP_SWOOLE_VERSION="v5.1.2" \ PHP_MONGODB_VERSION="1.16.1" RUN \ From 72794d80dde8826f9b637b88700cea60eb8582cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Wed, 28 Feb 2024 17:21:10 +0000 Subject: [PATCH 2/4] Upgrade more versions --- Dockerfile | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9d0c18..e4aa46f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,27 @@ ENV PHP_SWOOLE_VERSION="v5.1.2" \ RUN \ apk add --no-cache --virtual .deps \ + linux-headers \ make \ automake \ autoconf \ gcc \ g++ \ git \ - openssl-dev + zlib-dev \ + openssl-dev \ + yaml-dev \ + imagemagick \ + imagemagick-dev \ + libjpeg-turbo-dev \ + jpeg-dev \ + libjxl-dev \ + libmaxminddb-dev \ + zstd-dev \ + brotli-dev \ + lz4-dev \ + curl-dev + RUN docker-php-ext-install sockets @@ -49,7 +63,7 @@ RUN \ make && make install # Proxy -FROM php:8.1.25-cli-alpine3.16 as final +FROM php:8.3.3-cli-alpine3.19 as final ARG UTOPIA_DATA_API_VERSION ENV UTOPIA_DATA_API_VERSION=$UTOPIA_DATA_API_VERSION @@ -79,8 +93,8 @@ COPY ./app /usr/local/app # Extensions and libraries COPY --from=composer /usr/local/src/vendor /usr/local/vendor -COPY --from=swoole /usr/local/lib/php/extensions/no-debug-non-zts-20210902/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ -COPY --from=mongodb /usr/local/lib/php/extensions/no-debug-non-zts-20210902/mongodb.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ +COPY --from=swoole /usr/local/lib/php/extensions/no-debug-non-zts-20230831/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ +COPY --from=mongodb /usr/local/lib/php/extensions/no-debug-non-zts-20230831/mongodb.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini From a28282c53885acd6b150213cd92eceaf5b3e9e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Wed, 28 Feb 2024 17:21:18 +0000 Subject: [PATCH 3/4] Revert changes --- Dockerfile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index e4aa46f..ea69efd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,27 +17,13 @@ ENV PHP_SWOOLE_VERSION="v5.1.2" \ RUN \ apk add --no-cache --virtual .deps \ - linux-headers \ make \ automake \ autoconf \ gcc \ g++ \ git \ - zlib-dev \ - openssl-dev \ - yaml-dev \ - imagemagick \ - imagemagick-dev \ - libjpeg-turbo-dev \ - jpeg-dev \ - libjxl-dev \ - libmaxminddb-dev \ - zstd-dev \ - brotli-dev \ - lz4-dev \ - curl-dev - + openssl-dev RUN docker-php-ext-install sockets From c0667bd9f85e8d1891569bc76ff01bbabab13683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Wed, 28 Feb 2024 17:31:46 +0000 Subject: [PATCH 4/4] Fix docker build --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ea69efd..94119e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,10 @@ RUN \ gcc \ g++ \ git \ - openssl-dev + openssl-dev \ + linux-headers \ + curl-dev + RUN docker-php-ext-install sockets @@ -68,6 +71,7 @@ RUN \ && apk add --no-cache \ libstdc++ \ postgresql-dev \ + linux-headers \ && docker-php-ext-install sockets pdo_mysql pdo_pgsql \ && apk del .deps \ && rm -rf /var/cache/apk/*