From 7d0183f3cbe16e775bdebaa47f26547a338e7b48 Mon Sep 17 00:00:00 2001 From: Thomas Clavier Date: Thu, 26 Oct 2023 11:48:34 +0200 Subject: [PATCH 1/2] Expose PHP_FPM_DIR --- Dockerfile-linux.template | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 17fc812ad1..33b0bf7946 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -457,6 +457,7 @@ WORKDIR /var/www/html EXPOSE 80 {{ ) elif env.variant == "fpm" then ( -}} WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ From c542b03dfacb31783c28bb2f8356b6b2da18ff2c Mon Sep 17 00:00:00 2001 From: Thomas Clavier Date: Tue, 31 Oct 2023 15:21:20 +0100 Subject: [PATCH 2/2] apply-templates.sh is not automaticaly run by CI/CD --- 8.0/alpine3.16/fpm/Dockerfile | 1 + 8.0/bullseye/fpm/Dockerfile | 1 + 8.0/buster/fpm/Dockerfile | 1 + 8.1/alpine3.16/fpm/Dockerfile | 1 + 8.1/alpine3.17/fpm/Dockerfile | 1 + 8.1/alpine3.18/fpm/Dockerfile | 1 + 8.1/bookworm/fpm/Dockerfile | 1 + 8.1/bullseye/fpm/Dockerfile | 1 + 8.2/alpine3.17/fpm/Dockerfile | 1 + 8.2/alpine3.18/fpm/Dockerfile | 1 + 8.2/bookworm/fpm/Dockerfile | 1 + 8.2/bullseye/fpm/Dockerfile | 1 + 8.3-rc/alpine3.17/fpm/Dockerfile | 1 + 8.3-rc/alpine3.18/fpm/Dockerfile | 1 + 8.3-rc/bookworm/fpm/Dockerfile | 1 + 8.3-rc/bullseye/fpm/Dockerfile | 1 + 16 files changed, 16 insertions(+) diff --git a/8.0/alpine3.16/fpm/Dockerfile b/8.0/alpine3.16/fpm/Dockerfile index aa40bf88d5..a436028c4f 100644 --- a/8.0/alpine3.16/fpm/Dockerfile +++ b/8.0/alpine3.16/fpm/Dockerfile @@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.0/bullseye/fpm/Dockerfile b/8.0/bullseye/fpm/Dockerfile index 3027591328..f1f72941df 100644 --- a/8.0/bullseye/fpm/Dockerfile +++ b/8.0/bullseye/fpm/Dockerfile @@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.0/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile index 9247f9407a..718f60a2db 100644 --- a/8.0/buster/fpm/Dockerfile +++ b/8.0/buster/fpm/Dockerfile @@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.1/alpine3.16/fpm/Dockerfile b/8.1/alpine3.16/fpm/Dockerfile index 62e561929d..4887fcd3e4 100644 --- a/8.1/alpine3.16/fpm/Dockerfile +++ b/8.1/alpine3.16/fpm/Dockerfile @@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.1/alpine3.17/fpm/Dockerfile b/8.1/alpine3.17/fpm/Dockerfile index fb18ed3392..74bb640108 100644 --- a/8.1/alpine3.17/fpm/Dockerfile +++ b/8.1/alpine3.17/fpm/Dockerfile @@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.1/alpine3.18/fpm/Dockerfile b/8.1/alpine3.18/fpm/Dockerfile index a67c52f0d4..1cff9d335b 100644 --- a/8.1/alpine3.18/fpm/Dockerfile +++ b/8.1/alpine3.18/fpm/Dockerfile @@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.1/bookworm/fpm/Dockerfile b/8.1/bookworm/fpm/Dockerfile index 8d069a8a13..e23336e0ff 100644 --- a/8.1/bookworm/fpm/Dockerfile +++ b/8.1/bookworm/fpm/Dockerfile @@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.1/bullseye/fpm/Dockerfile b/8.1/bullseye/fpm/Dockerfile index f2a6be0d60..1c5a454728 100644 --- a/8.1/bullseye/fpm/Dockerfile +++ b/8.1/bullseye/fpm/Dockerfile @@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.2/alpine3.17/fpm/Dockerfile b/8.2/alpine3.17/fpm/Dockerfile index a2693d6069..bbe47e7960 100644 --- a/8.2/alpine3.17/fpm/Dockerfile +++ b/8.2/alpine3.17/fpm/Dockerfile @@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.2/alpine3.18/fpm/Dockerfile b/8.2/alpine3.18/fpm/Dockerfile index 91164178a4..ba90e47942 100644 --- a/8.2/alpine3.18/fpm/Dockerfile +++ b/8.2/alpine3.18/fpm/Dockerfile @@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.2/bookworm/fpm/Dockerfile b/8.2/bookworm/fpm/Dockerfile index e0d1343c86..8b634539fa 100644 --- a/8.2/bookworm/fpm/Dockerfile +++ b/8.2/bookworm/fpm/Dockerfile @@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.2/bullseye/fpm/Dockerfile b/8.2/bullseye/fpm/Dockerfile index 08ebb4f187..d58a08765c 100644 --- a/8.2/bullseye/fpm/Dockerfile +++ b/8.2/bullseye/fpm/Dockerfile @@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.3-rc/alpine3.17/fpm/Dockerfile b/8.3-rc/alpine3.17/fpm/Dockerfile index 2569907fc9..eb2127d790 100644 --- a/8.3-rc/alpine3.17/fpm/Dockerfile +++ b/8.3-rc/alpine3.17/fpm/Dockerfile @@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.3-rc/alpine3.18/fpm/Dockerfile b/8.3-rc/alpine3.18/fpm/Dockerfile index dca45bbb07..53d53abbdd 100644 --- a/8.3-rc/alpine3.18/fpm/Dockerfile +++ b/8.3-rc/alpine3.18/fpm/Dockerfile @@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.3-rc/bookworm/fpm/Dockerfile b/8.3-rc/bookworm/fpm/Dockerfile index bc22068e94..094a0ba367 100644 --- a/8.3-rc/bookworm/fpm/Dockerfile +++ b/8.3-rc/bookworm/fpm/Dockerfile @@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \ diff --git a/8.3-rc/bullseye/fpm/Dockerfile b/8.3-rc/bullseye/fpm/Dockerfile index dcbae26dde..051d57cb2c 100644 --- a/8.3-rc/bullseye/fpm/Dockerfile +++ b/8.3-rc/bullseye/fpm/Dockerfile @@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html +ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d RUN set -eux; \ cd /usr/local/etc; \