From dff0cd18c3ae31153a46ec5d882a2e4023991309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20HOUZ=C3=89?= Date: Sun, 29 Aug 2021 14:38:35 +0200 Subject: [PATCH 1/2] feat(runtimes): build and publish PHP 8.1 docker images Related to https://github.com/brefphp/bref/pull/980/files#r695552502 For now xdebug & blackfire are not included because no php 8.1 version available yet. --- Makefile | 2 ++ runtime/Makefile | 2 +- runtime/layers/fpm-dev/Dockerfile | 7 +++++-- runtime/layers/tests.php | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 68db31c33..199cdb3ea 100644 --- a/Makefile +++ b/Makefile @@ -24,9 +24,11 @@ publish-docker-images: docker-images "bref/php-73" "bref/php-73-fpm" "bref/php-73-console" "bref/php-73-fpm-dev" \ "bref/php-74" "bref/php-74-fpm" "bref/php-74-console" "bref/php-74-fpm-dev" \ "bref/php-80" "bref/php-80-fpm" "bref/php-80-console" "bref/php-80-fpm-dev" \ + "bref/php-81" "bref/php-81-fpm" "bref/php-81-console" "bref/php-81-fpm-dev" \ "bref/build-php-73" \ "bref/build-php-74" \ "bref/build-php-80" \ + "bref/build-php-81" \ "bref/fpm-dev-gateway"; \ do \ docker image tag $$image:latest $$image:${DOCKER_TAG} ; \ diff --git a/runtime/Makefile b/runtime/Makefile index 7d8773837..8aec43182 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -62,7 +62,7 @@ docker-images: cd layers/fpm-dev ; docker build -t bref/php-73-fpm-dev --build-arg PHP_VERSION=73 . cd layers/fpm-dev ; docker build -t bref/php-74-fpm-dev --build-arg PHP_VERSION=74 . cd layers/fpm-dev ; docker build -t bref/php-80-fpm-dev --build-arg PHP_VERSION=80 . - #cd layers/fpm-dev ; docker build -t bref/php-81-fpm-dev --build-arg PHP_VERSION=81 . # xdebug not ok + cd layers/fpm-dev ; docker build -t bref/php-81-fpm-dev --build-arg PHP_VERSION=81 --target=without_extensions . cd layers/web; docker build -t bref/fpm-dev-gateway . # Run tests php layers/tests.php diff --git a/runtime/layers/fpm-dev/Dockerfile b/runtime/layers/fpm-dev/Dockerfile index ca38237bb..c608f74b1 100644 --- a/runtime/layers/fpm-dev/Dockerfile +++ b/runtime/layers/fpm-dev/Dockerfile @@ -13,9 +13,8 @@ USER root COPY --from=build_extensions /tmp/*.so /tmp/ RUN cp /tmp/*.so $(php -r "echo ini_get('extension_dir');") -FROM bref/php-${PHP_VERSION}-fpm +FROM bref/php-${PHP_VERSION}-fpm as without_extensions -COPY --from=build_dev /opt /opt # Override the config so that PHP-FPM listens on port 9000 COPY php-fpm.conf /opt/bref/etc/php-fpm.conf @@ -29,3 +28,7 @@ ENV PHP_INI_SCAN_DIR="/opt/bref/etc/php/conf.d:/var/task/php/conf.d:/var/task/ph # Run PHP-FPM # opcache.validate_timestamps=1 : cancels the flag in the base configuration so that files are reloaded CMD /opt/bin/php-fpm --nodaemonize --fpm-config /opt/bref/etc/php-fpm.conf -d opcache.validate_timestamps=1 --force-stderr + +FROM without_extensions + +COPY --from=build_dev /opt /opt diff --git a/runtime/layers/tests.php b/runtime/layers/tests.php index 8685c73d9..76d2e9957 100644 --- a/runtime/layers/tests.php +++ b/runtime/layers/tests.php @@ -18,7 +18,7 @@ 'bref/php-73-fpm-dev', 'bref/php-74-fpm-dev', 'bref/php-80-fpm-dev', - // 'bref/php-81-fpm-dev', + 'bref/php-81-fpm-dev', ]; foreach ($allLayers as $layer) { // Working directory @@ -51,7 +51,7 @@ 'bref/php-73-fpm-dev', 'bref/php-74-fpm-dev', 'bref/php-80-fpm-dev', - // 'bref/php-81-fpm-dev', + 'bref/php-81-fpm-dev', ]; foreach ($fpmLayers as $layer) { // PHP-FPM is installed From 3be97f34780282d39eea5976f6b6a0bebe3234ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20HOUZ=C3=89?= Date: Sun, 29 Aug 2021 18:07:43 +0200 Subject: [PATCH 2/2] try to fix ci --- runtime/layers/fpm-dev/Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/runtime/layers/fpm-dev/Dockerfile b/runtime/layers/fpm-dev/Dockerfile index c608f74b1..f677f4886 100644 --- a/runtime/layers/fpm-dev/Dockerfile +++ b/runtime/layers/fpm-dev/Dockerfile @@ -1,4 +1,16 @@ ARG PHP_VERSION +FROM bref/php-${PHP_VERSION}-fpm as without_extensions + +# Override the config so that PHP-FPM listens on port 9000 +COPY php-fpm.conf /opt/bref/etc/php-fpm.conf + +EXPOSE 9001 + +# Clear the parent entrypoint +ENTRYPOINT [] + +ENV PHP_INI_SCAN_DIR="/opt/bref/etc/php/conf.d:/var/task/php/conf.d:/var/task/php/conf.dev.d" + FROM bref/build-php-$PHP_VERSION as build_extensions RUN pecl install xdebug @@ -13,18 +25,6 @@ USER root COPY --from=build_extensions /tmp/*.so /tmp/ RUN cp /tmp/*.so $(php -r "echo ini_get('extension_dir');") -FROM bref/php-${PHP_VERSION}-fpm as without_extensions - -# Override the config so that PHP-FPM listens on port 9000 -COPY php-fpm.conf /opt/bref/etc/php-fpm.conf - -EXPOSE 9001 - -# Clear the parent entrypoint -ENTRYPOINT [] - -ENV PHP_INI_SCAN_DIR="/opt/bref/etc/php/conf.d:/var/task/php/conf.d:/var/task/php/conf.dev.d" - # Run PHP-FPM # opcache.validate_timestamps=1 : cancels the flag in the base configuration so that files are reloaded CMD /opt/bin/php-fpm --nodaemonize --fpm-config /opt/bref/etc/php-fpm.conf -d opcache.validate_timestamps=1 --force-stderr