From 42d658909b6e4ded0fc65dd4013bf97e474d848b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 17 Dec 2025 12:47:26 -0800 Subject: [PATCH] Set `sysconfdir` explicitly during build This allows us to completely remove the `php-fpm.conf` hacks by having PHP do the right thing by default instead. --- 8.1/alpine3.21/cli/Dockerfile | 2 ++ 8.1/alpine3.21/fpm/Dockerfile | 21 +++++++-------------- 8.1/alpine3.21/zts/Dockerfile | 2 ++ 8.1/alpine3.22/cli/Dockerfile | 2 ++ 8.1/alpine3.22/fpm/Dockerfile | 21 +++++++-------------- 8.1/alpine3.22/zts/Dockerfile | 2 ++ 8.1/bookworm/apache/Dockerfile | 2 ++ 8.1/bookworm/cli/Dockerfile | 2 ++ 8.1/bookworm/fpm/Dockerfile | 21 +++++++-------------- 8.1/bookworm/zts/Dockerfile | 2 ++ 8.1/trixie/apache/Dockerfile | 2 ++ 8.1/trixie/cli/Dockerfile | 2 ++ 8.1/trixie/fpm/Dockerfile | 21 +++++++-------------- 8.1/trixie/zts/Dockerfile | 2 ++ 8.2/alpine3.22/cli/Dockerfile | 2 ++ 8.2/alpine3.22/fpm/Dockerfile | 21 +++++++-------------- 8.2/alpine3.22/zts/Dockerfile | 2 ++ 8.2/alpine3.23/cli/Dockerfile | 2 ++ 8.2/alpine3.23/fpm/Dockerfile | 21 +++++++-------------- 8.2/alpine3.23/zts/Dockerfile | 2 ++ 8.2/bookworm/apache/Dockerfile | 2 ++ 8.2/bookworm/cli/Dockerfile | 2 ++ 8.2/bookworm/fpm/Dockerfile | 21 +++++++-------------- 8.2/bookworm/zts/Dockerfile | 2 ++ 8.2/trixie/apache/Dockerfile | 2 ++ 8.2/trixie/cli/Dockerfile | 2 ++ 8.2/trixie/fpm/Dockerfile | 21 +++++++-------------- 8.2/trixie/zts/Dockerfile | 2 ++ 8.3-rc/alpine3.22/cli/Dockerfile | 2 ++ 8.3-rc/alpine3.22/fpm/Dockerfile | 21 +++++++-------------- 8.3-rc/alpine3.22/zts/Dockerfile | 2 ++ 8.3-rc/alpine3.23/cli/Dockerfile | 2 ++ 8.3-rc/alpine3.23/fpm/Dockerfile | 21 +++++++-------------- 8.3-rc/alpine3.23/zts/Dockerfile | 2 ++ 8.3-rc/bookworm/apache/Dockerfile | 2 ++ 8.3-rc/bookworm/cli/Dockerfile | 2 ++ 8.3-rc/bookworm/fpm/Dockerfile | 21 +++++++-------------- 8.3-rc/bookworm/zts/Dockerfile | 2 ++ 8.3-rc/trixie/apache/Dockerfile | 2 ++ 8.3-rc/trixie/cli/Dockerfile | 2 ++ 8.3-rc/trixie/fpm/Dockerfile | 21 +++++++-------------- 8.3-rc/trixie/zts/Dockerfile | 2 ++ 8.3/alpine3.22/cli/Dockerfile | 2 ++ 8.3/alpine3.22/fpm/Dockerfile | 21 +++++++-------------- 8.3/alpine3.22/zts/Dockerfile | 2 ++ 8.3/alpine3.23/cli/Dockerfile | 2 ++ 8.3/alpine3.23/fpm/Dockerfile | 21 +++++++-------------- 8.3/alpine3.23/zts/Dockerfile | 2 ++ 8.3/bookworm/apache/Dockerfile | 2 ++ 8.3/bookworm/cli/Dockerfile | 2 ++ 8.3/bookworm/fpm/Dockerfile | 21 +++++++-------------- 8.3/bookworm/zts/Dockerfile | 2 ++ 8.3/trixie/apache/Dockerfile | 2 ++ 8.3/trixie/cli/Dockerfile | 2 ++ 8.3/trixie/fpm/Dockerfile | 21 +++++++-------------- 8.3/trixie/zts/Dockerfile | 2 ++ 8.4-rc/alpine3.22/cli/Dockerfile | 2 ++ 8.4-rc/alpine3.22/fpm/Dockerfile | 21 +++++++-------------- 8.4-rc/alpine3.22/zts/Dockerfile | 2 ++ 8.4-rc/alpine3.23/cli/Dockerfile | 2 ++ 8.4-rc/alpine3.23/fpm/Dockerfile | 21 +++++++-------------- 8.4-rc/alpine3.23/zts/Dockerfile | 2 ++ 8.4-rc/bookworm/apache/Dockerfile | 2 ++ 8.4-rc/bookworm/cli/Dockerfile | 2 ++ 8.4-rc/bookworm/fpm/Dockerfile | 21 +++++++-------------- 8.4-rc/bookworm/zts/Dockerfile | 2 ++ 8.4-rc/trixie/apache/Dockerfile | 2 ++ 8.4-rc/trixie/cli/Dockerfile | 2 ++ 8.4-rc/trixie/fpm/Dockerfile | 21 +++++++-------------- 8.4-rc/trixie/zts/Dockerfile | 2 ++ 8.4/alpine3.22/cli/Dockerfile | 2 ++ 8.4/alpine3.22/fpm/Dockerfile | 21 +++++++-------------- 8.4/alpine3.22/zts/Dockerfile | 2 ++ 8.4/alpine3.23/cli/Dockerfile | 2 ++ 8.4/alpine3.23/fpm/Dockerfile | 21 +++++++-------------- 8.4/alpine3.23/zts/Dockerfile | 2 ++ 8.4/bookworm/apache/Dockerfile | 2 ++ 8.4/bookworm/cli/Dockerfile | 2 ++ 8.4/bookworm/fpm/Dockerfile | 21 +++++++-------------- 8.4/bookworm/zts/Dockerfile | 2 ++ 8.4/trixie/apache/Dockerfile | 2 ++ 8.4/trixie/cli/Dockerfile | 2 ++ 8.4/trixie/fpm/Dockerfile | 21 +++++++-------------- 8.4/trixie/zts/Dockerfile | 2 ++ 8.5-rc/alpine3.22/cli/Dockerfile | 2 ++ 8.5-rc/alpine3.22/fpm/Dockerfile | 21 +++++++-------------- 8.5-rc/alpine3.22/zts/Dockerfile | 2 ++ 8.5-rc/alpine3.23/cli/Dockerfile | 2 ++ 8.5-rc/alpine3.23/fpm/Dockerfile | 21 +++++++-------------- 8.5-rc/alpine3.23/zts/Dockerfile | 2 ++ 8.5-rc/bookworm/apache/Dockerfile | 2 ++ 8.5-rc/bookworm/cli/Dockerfile | 2 ++ 8.5-rc/bookworm/fpm/Dockerfile | 21 +++++++-------------- 8.5-rc/bookworm/zts/Dockerfile | 2 ++ 8.5-rc/trixie/apache/Dockerfile | 2 ++ 8.5-rc/trixie/cli/Dockerfile | 2 ++ 8.5-rc/trixie/fpm/Dockerfile | 21 +++++++-------------- 8.5-rc/trixie/zts/Dockerfile | 2 ++ 8.5/alpine3.22/cli/Dockerfile | 2 ++ 8.5/alpine3.22/fpm/Dockerfile | 21 +++++++-------------- 8.5/alpine3.22/zts/Dockerfile | 2 ++ 8.5/alpine3.23/cli/Dockerfile | 2 ++ 8.5/alpine3.23/fpm/Dockerfile | 21 +++++++-------------- 8.5/alpine3.23/zts/Dockerfile | 2 ++ 8.5/bookworm/apache/Dockerfile | 2 ++ 8.5/bookworm/cli/Dockerfile | 2 ++ 8.5/bookworm/fpm/Dockerfile | 21 +++++++-------------- 8.5/bookworm/zts/Dockerfile | 2 ++ 8.5/trixie/apache/Dockerfile | 2 ++ 8.5/trixie/cli/Dockerfile | 2 ++ 8.5/trixie/fpm/Dockerfile | 21 +++++++-------------- 8.5/trixie/zts/Dockerfile | 2 ++ Dockerfile-linux.template | 21 +++++++-------------- 113 files changed, 391 insertions(+), 462 deletions(-) diff --git a/8.1/alpine3.21/cli/Dockerfile b/8.1/alpine3.21/cli/Dockerfile index 200facad9..44fbb3570 100644 --- a/8.1/alpine3.21/cli/Dockerfile +++ b/8.1/alpine3.21/cli/Dockerfile @@ -129,8 +129,10 @@ RUN set -eux; \ filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ rm 14834.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.1/alpine3.21/fpm/Dockerfile b/8.1/alpine3.21/fpm/Dockerfile index c8b7e9e9b..6708f4a06 100644 --- a/8.1/alpine3.21/fpm/Dockerfile +++ b/8.1/alpine3.21/fpm/Dockerfile @@ -129,8 +129,10 @@ RUN set -eux; \ filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ rm 14834.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -228,20 +230,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.1/alpine3.21/zts/Dockerfile b/8.1/alpine3.21/zts/Dockerfile index 4de55cf74..1efb7e258 100644 --- a/8.1/alpine3.21/zts/Dockerfile +++ b/8.1/alpine3.21/zts/Dockerfile @@ -129,8 +129,10 @@ RUN set -eux; \ filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ rm 14834.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.1/alpine3.22/cli/Dockerfile b/8.1/alpine3.22/cli/Dockerfile index c7c517cdf..90262daf9 100644 --- a/8.1/alpine3.22/cli/Dockerfile +++ b/8.1/alpine3.22/cli/Dockerfile @@ -129,8 +129,10 @@ RUN set -eux; \ filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ rm 14834.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.1/alpine3.22/fpm/Dockerfile b/8.1/alpine3.22/fpm/Dockerfile index f7b31a9a1..9cb4e5c21 100644 --- a/8.1/alpine3.22/fpm/Dockerfile +++ b/8.1/alpine3.22/fpm/Dockerfile @@ -129,8 +129,10 @@ RUN set -eux; \ filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ rm 14834.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -228,20 +230,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.1/alpine3.22/zts/Dockerfile b/8.1/alpine3.22/zts/Dockerfile index 770f9c734..4934977c5 100644 --- a/8.1/alpine3.22/zts/Dockerfile +++ b/8.1/alpine3.22/zts/Dockerfile @@ -135,8 +135,10 @@ RUN set -eux; \ filterdiff -x '*/NEWS' 18743.patch | patch -p1; \ rm 18743.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.1/bookworm/apache/Dockerfile b/8.1/bookworm/apache/Dockerfile index 1bb1d4638..6e864384b 100644 --- a/8.1/bookworm/apache/Dockerfile +++ b/8.1/bookworm/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.1/bookworm/cli/Dockerfile b/8.1/bookworm/cli/Dockerfile index 006f194dd..a39286737 100644 --- a/8.1/bookworm/cli/Dockerfile +++ b/8.1/bookworm/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.1/bookworm/fpm/Dockerfile b/8.1/bookworm/fpm/Dockerfile index 97421c904..a9dbd9199 100644 --- a/8.1/bookworm/fpm/Dockerfile +++ b/8.1/bookworm/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -232,20 +234,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.1/bookworm/zts/Dockerfile b/8.1/bookworm/zts/Dockerfile index 73e78be98..044ffe8bc 100644 --- a/8.1/bookworm/zts/Dockerfile +++ b/8.1/bookworm/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.1/trixie/apache/Dockerfile b/8.1/trixie/apache/Dockerfile index a3dfec4f9..679a206de 100644 --- a/8.1/trixie/apache/Dockerfile +++ b/8.1/trixie/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.1/trixie/cli/Dockerfile b/8.1/trixie/cli/Dockerfile index 0aa747061..7b51687bf 100644 --- a/8.1/trixie/cli/Dockerfile +++ b/8.1/trixie/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.1/trixie/fpm/Dockerfile b/8.1/trixie/fpm/Dockerfile index af842f2eb..58f32089e 100644 --- a/8.1/trixie/fpm/Dockerfile +++ b/8.1/trixie/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -232,20 +234,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.1/trixie/zts/Dockerfile b/8.1/trixie/zts/Dockerfile index 30e6f4c27..f55eded7d 100644 --- a/8.1/trixie/zts/Dockerfile +++ b/8.1/trixie/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.2/alpine3.22/cli/Dockerfile b/8.2/alpine3.22/cli/Dockerfile index be9d0e913..95433a6ed 100644 --- a/8.2/alpine3.22/cli/Dockerfile +++ b/8.2/alpine3.22/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.2/alpine3.22/fpm/Dockerfile b/8.2/alpine3.22/fpm/Dockerfile index 001bc3b3c..826cf7685 100644 --- a/8.2/alpine3.22/fpm/Dockerfile +++ b/8.2/alpine3.22/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -213,20 +215,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.2/alpine3.22/zts/Dockerfile b/8.2/alpine3.22/zts/Dockerfile index 689b9abae..2fac71ee9 100644 --- a/8.2/alpine3.22/zts/Dockerfile +++ b/8.2/alpine3.22/zts/Dockerfile @@ -124,8 +124,10 @@ RUN set -eux; \ filterdiff -x '*/NEWS' 18743.patch | patch -p1; \ rm 18743.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.2/alpine3.23/cli/Dockerfile b/8.2/alpine3.23/cli/Dockerfile index 45016a870..c7fb91fc5 100644 --- a/8.2/alpine3.23/cli/Dockerfile +++ b/8.2/alpine3.23/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.2/alpine3.23/fpm/Dockerfile b/8.2/alpine3.23/fpm/Dockerfile index 5b68c2cde..64c52dec6 100644 --- a/8.2/alpine3.23/fpm/Dockerfile +++ b/8.2/alpine3.23/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -213,20 +215,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.2/alpine3.23/zts/Dockerfile b/8.2/alpine3.23/zts/Dockerfile index 2276572db..660437f48 100644 --- a/8.2/alpine3.23/zts/Dockerfile +++ b/8.2/alpine3.23/zts/Dockerfile @@ -124,8 +124,10 @@ RUN set -eux; \ filterdiff -x '*/NEWS' 18743.patch | patch -p1; \ rm 18743.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.2/bookworm/apache/Dockerfile b/8.2/bookworm/apache/Dockerfile index 49c85c4c6..263f49bbf 100644 --- a/8.2/bookworm/apache/Dockerfile +++ b/8.2/bookworm/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.2/bookworm/cli/Dockerfile b/8.2/bookworm/cli/Dockerfile index 29f7e7b7f..a0f94377e 100644 --- a/8.2/bookworm/cli/Dockerfile +++ b/8.2/bookworm/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.2/bookworm/fpm/Dockerfile b/8.2/bookworm/fpm/Dockerfile index 124f4bef0..909e78f92 100644 --- a/8.2/bookworm/fpm/Dockerfile +++ b/8.2/bookworm/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -230,20 +232,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.2/bookworm/zts/Dockerfile b/8.2/bookworm/zts/Dockerfile index 88d124f6e..f4d118b8b 100644 --- a/8.2/bookworm/zts/Dockerfile +++ b/8.2/bookworm/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.2/trixie/apache/Dockerfile b/8.2/trixie/apache/Dockerfile index c8b3d92ac..6404fbd34 100644 --- a/8.2/trixie/apache/Dockerfile +++ b/8.2/trixie/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.2/trixie/cli/Dockerfile b/8.2/trixie/cli/Dockerfile index 8d3f55ee0..a76ecd5fe 100644 --- a/8.2/trixie/cli/Dockerfile +++ b/8.2/trixie/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.2/trixie/fpm/Dockerfile b/8.2/trixie/fpm/Dockerfile index 1fc0a9d2a..5ec61506c 100644 --- a/8.2/trixie/fpm/Dockerfile +++ b/8.2/trixie/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -230,20 +232,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.2/trixie/zts/Dockerfile b/8.2/trixie/zts/Dockerfile index acbc0c95c..70b7a1a41 100644 --- a/8.2/trixie/zts/Dockerfile +++ b/8.2/trixie/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3-rc/alpine3.22/cli/Dockerfile b/8.3-rc/alpine3.22/cli/Dockerfile index bf95f502f..340722eac 100644 --- a/8.3-rc/alpine3.22/cli/Dockerfile +++ b/8.3-rc/alpine3.22/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3-rc/alpine3.22/fpm/Dockerfile b/8.3-rc/alpine3.22/fpm/Dockerfile index 75ed0ad5e..51560ce3f 100644 --- a/8.3-rc/alpine3.22/fpm/Dockerfile +++ b/8.3-rc/alpine3.22/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -209,20 +211,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.3-rc/alpine3.22/zts/Dockerfile b/8.3-rc/alpine3.22/zts/Dockerfile index bbede5068..19ffcdcdd 100644 --- a/8.3-rc/alpine3.22/zts/Dockerfile +++ b/8.3-rc/alpine3.22/zts/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3-rc/alpine3.23/cli/Dockerfile b/8.3-rc/alpine3.23/cli/Dockerfile index f113c9c6e..8702c369b 100644 --- a/8.3-rc/alpine3.23/cli/Dockerfile +++ b/8.3-rc/alpine3.23/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3-rc/alpine3.23/fpm/Dockerfile b/8.3-rc/alpine3.23/fpm/Dockerfile index 3481c3ed3..1eeb799c8 100644 --- a/8.3-rc/alpine3.23/fpm/Dockerfile +++ b/8.3-rc/alpine3.23/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -209,20 +211,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.3-rc/alpine3.23/zts/Dockerfile b/8.3-rc/alpine3.23/zts/Dockerfile index 8e8e761fd..74a280255 100644 --- a/8.3-rc/alpine3.23/zts/Dockerfile +++ b/8.3-rc/alpine3.23/zts/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3-rc/bookworm/apache/Dockerfile b/8.3-rc/bookworm/apache/Dockerfile index 11e9842f7..a43a15eb4 100644 --- a/8.3-rc/bookworm/apache/Dockerfile +++ b/8.3-rc/bookworm/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3-rc/bookworm/cli/Dockerfile b/8.3-rc/bookworm/cli/Dockerfile index 7c1e0f0fe..e9c92683b 100644 --- a/8.3-rc/bookworm/cli/Dockerfile +++ b/8.3-rc/bookworm/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3-rc/bookworm/fpm/Dockerfile b/8.3-rc/bookworm/fpm/Dockerfile index 117b2e492..36a401cff 100644 --- a/8.3-rc/bookworm/fpm/Dockerfile +++ b/8.3-rc/bookworm/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -226,20 +228,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.3-rc/bookworm/zts/Dockerfile b/8.3-rc/bookworm/zts/Dockerfile index 494a8b14d..2ac7f1186 100644 --- a/8.3-rc/bookworm/zts/Dockerfile +++ b/8.3-rc/bookworm/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3-rc/trixie/apache/Dockerfile b/8.3-rc/trixie/apache/Dockerfile index f126da3be..830d68319 100644 --- a/8.3-rc/trixie/apache/Dockerfile +++ b/8.3-rc/trixie/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3-rc/trixie/cli/Dockerfile b/8.3-rc/trixie/cli/Dockerfile index 6a4ed7367..202b505dc 100644 --- a/8.3-rc/trixie/cli/Dockerfile +++ b/8.3-rc/trixie/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3-rc/trixie/fpm/Dockerfile b/8.3-rc/trixie/fpm/Dockerfile index 0e9a14b35..2987715cd 100644 --- a/8.3-rc/trixie/fpm/Dockerfile +++ b/8.3-rc/trixie/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -226,20 +228,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.3-rc/trixie/zts/Dockerfile b/8.3-rc/trixie/zts/Dockerfile index f2fa78da4..05def37c6 100644 --- a/8.3-rc/trixie/zts/Dockerfile +++ b/8.3-rc/trixie/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3/alpine3.22/cli/Dockerfile b/8.3/alpine3.22/cli/Dockerfile index e4cd3c179..893c8719b 100644 --- a/8.3/alpine3.22/cli/Dockerfile +++ b/8.3/alpine3.22/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3/alpine3.22/fpm/Dockerfile b/8.3/alpine3.22/fpm/Dockerfile index ac3f8eade..e0dcd4958 100644 --- a/8.3/alpine3.22/fpm/Dockerfile +++ b/8.3/alpine3.22/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -209,20 +211,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.3/alpine3.22/zts/Dockerfile b/8.3/alpine3.22/zts/Dockerfile index 32fe200d2..f118ef6d7 100644 --- a/8.3/alpine3.22/zts/Dockerfile +++ b/8.3/alpine3.22/zts/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3/alpine3.23/cli/Dockerfile b/8.3/alpine3.23/cli/Dockerfile index 4610597d7..c2d07fc16 100644 --- a/8.3/alpine3.23/cli/Dockerfile +++ b/8.3/alpine3.23/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3/alpine3.23/fpm/Dockerfile b/8.3/alpine3.23/fpm/Dockerfile index a4e4e2de7..28b9a3fe4 100644 --- a/8.3/alpine3.23/fpm/Dockerfile +++ b/8.3/alpine3.23/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -209,20 +211,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.3/alpine3.23/zts/Dockerfile b/8.3/alpine3.23/zts/Dockerfile index e6dea125b..5b20124b5 100644 --- a/8.3/alpine3.23/zts/Dockerfile +++ b/8.3/alpine3.23/zts/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3/bookworm/apache/Dockerfile b/8.3/bookworm/apache/Dockerfile index 4db1e92b6..ae70a2b3a 100644 --- a/8.3/bookworm/apache/Dockerfile +++ b/8.3/bookworm/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3/bookworm/cli/Dockerfile b/8.3/bookworm/cli/Dockerfile index d4d5f3679..308363a11 100644 --- a/8.3/bookworm/cli/Dockerfile +++ b/8.3/bookworm/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3/bookworm/fpm/Dockerfile b/8.3/bookworm/fpm/Dockerfile index 6fdedcea9..4a1d6dfc5 100644 --- a/8.3/bookworm/fpm/Dockerfile +++ b/8.3/bookworm/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -226,20 +228,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.3/bookworm/zts/Dockerfile b/8.3/bookworm/zts/Dockerfile index c10b56866..230e3d65f 100644 --- a/8.3/bookworm/zts/Dockerfile +++ b/8.3/bookworm/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3/trixie/apache/Dockerfile b/8.3/trixie/apache/Dockerfile index 1cc9471a3..a5c5d3854 100644 --- a/8.3/trixie/apache/Dockerfile +++ b/8.3/trixie/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3/trixie/cli/Dockerfile b/8.3/trixie/cli/Dockerfile index ff125f3fa..1fb8d1a1d 100644 --- a/8.3/trixie/cli/Dockerfile +++ b/8.3/trixie/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.3/trixie/fpm/Dockerfile b/8.3/trixie/fpm/Dockerfile index 889d89a0a..524895fa4 100644 --- a/8.3/trixie/fpm/Dockerfile +++ b/8.3/trixie/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -226,20 +228,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.3/trixie/zts/Dockerfile b/8.3/trixie/zts/Dockerfile index c034221c2..0a2caad65 100644 --- a/8.3/trixie/zts/Dockerfile +++ b/8.3/trixie/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4-rc/alpine3.22/cli/Dockerfile b/8.4-rc/alpine3.22/cli/Dockerfile index 2e85aa689..3a2f9ea66 100644 --- a/8.4-rc/alpine3.22/cli/Dockerfile +++ b/8.4-rc/alpine3.22/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4-rc/alpine3.22/fpm/Dockerfile b/8.4-rc/alpine3.22/fpm/Dockerfile index 840824dbf..9e7261da3 100644 --- a/8.4-rc/alpine3.22/fpm/Dockerfile +++ b/8.4-rc/alpine3.22/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -209,20 +211,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.4-rc/alpine3.22/zts/Dockerfile b/8.4-rc/alpine3.22/zts/Dockerfile index ccff72702..284c6667b 100644 --- a/8.4-rc/alpine3.22/zts/Dockerfile +++ b/8.4-rc/alpine3.22/zts/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4-rc/alpine3.23/cli/Dockerfile b/8.4-rc/alpine3.23/cli/Dockerfile index 3109cdc37..dafee316e 100644 --- a/8.4-rc/alpine3.23/cli/Dockerfile +++ b/8.4-rc/alpine3.23/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4-rc/alpine3.23/fpm/Dockerfile b/8.4-rc/alpine3.23/fpm/Dockerfile index f3d843e30..45b459a44 100644 --- a/8.4-rc/alpine3.23/fpm/Dockerfile +++ b/8.4-rc/alpine3.23/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -209,20 +211,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.4-rc/alpine3.23/zts/Dockerfile b/8.4-rc/alpine3.23/zts/Dockerfile index e64d4e36d..5a08325b7 100644 --- a/8.4-rc/alpine3.23/zts/Dockerfile +++ b/8.4-rc/alpine3.23/zts/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4-rc/bookworm/apache/Dockerfile b/8.4-rc/bookworm/apache/Dockerfile index 126b32b87..8071dc137 100644 --- a/8.4-rc/bookworm/apache/Dockerfile +++ b/8.4-rc/bookworm/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4-rc/bookworm/cli/Dockerfile b/8.4-rc/bookworm/cli/Dockerfile index 183b7c5a5..41151e5a5 100644 --- a/8.4-rc/bookworm/cli/Dockerfile +++ b/8.4-rc/bookworm/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4-rc/bookworm/fpm/Dockerfile b/8.4-rc/bookworm/fpm/Dockerfile index 70c78ca2d..6657934b0 100644 --- a/8.4-rc/bookworm/fpm/Dockerfile +++ b/8.4-rc/bookworm/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -226,20 +228,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.4-rc/bookworm/zts/Dockerfile b/8.4-rc/bookworm/zts/Dockerfile index 708d65684..2da5f4da5 100644 --- a/8.4-rc/bookworm/zts/Dockerfile +++ b/8.4-rc/bookworm/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4-rc/trixie/apache/Dockerfile b/8.4-rc/trixie/apache/Dockerfile index 350d5059a..a4d375394 100644 --- a/8.4-rc/trixie/apache/Dockerfile +++ b/8.4-rc/trixie/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4-rc/trixie/cli/Dockerfile b/8.4-rc/trixie/cli/Dockerfile index ad59f7802..f0cdddae2 100644 --- a/8.4-rc/trixie/cli/Dockerfile +++ b/8.4-rc/trixie/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4-rc/trixie/fpm/Dockerfile b/8.4-rc/trixie/fpm/Dockerfile index d323b7849..fd3c730e1 100644 --- a/8.4-rc/trixie/fpm/Dockerfile +++ b/8.4-rc/trixie/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -226,20 +228,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.4-rc/trixie/zts/Dockerfile b/8.4-rc/trixie/zts/Dockerfile index 9015633a8..3d5237788 100644 --- a/8.4-rc/trixie/zts/Dockerfile +++ b/8.4-rc/trixie/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4/alpine3.22/cli/Dockerfile b/8.4/alpine3.22/cli/Dockerfile index f37f970c0..bf80ff483 100644 --- a/8.4/alpine3.22/cli/Dockerfile +++ b/8.4/alpine3.22/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4/alpine3.22/fpm/Dockerfile b/8.4/alpine3.22/fpm/Dockerfile index b838d74e0..669aa586b 100644 --- a/8.4/alpine3.22/fpm/Dockerfile +++ b/8.4/alpine3.22/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -209,20 +211,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.4/alpine3.22/zts/Dockerfile b/8.4/alpine3.22/zts/Dockerfile index 0a4aa5b5b..f50b40300 100644 --- a/8.4/alpine3.22/zts/Dockerfile +++ b/8.4/alpine3.22/zts/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4/alpine3.23/cli/Dockerfile b/8.4/alpine3.23/cli/Dockerfile index fac64956f..2df6eaa3a 100644 --- a/8.4/alpine3.23/cli/Dockerfile +++ b/8.4/alpine3.23/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4/alpine3.23/fpm/Dockerfile b/8.4/alpine3.23/fpm/Dockerfile index a4d8febdc..56ae569f9 100644 --- a/8.4/alpine3.23/fpm/Dockerfile +++ b/8.4/alpine3.23/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -209,20 +211,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.4/alpine3.23/zts/Dockerfile b/8.4/alpine3.23/zts/Dockerfile index eef1e1aa0..93f8ce2ad 100644 --- a/8.4/alpine3.23/zts/Dockerfile +++ b/8.4/alpine3.23/zts/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4/bookworm/apache/Dockerfile b/8.4/bookworm/apache/Dockerfile index 4402f2e97..d58f89a13 100644 --- a/8.4/bookworm/apache/Dockerfile +++ b/8.4/bookworm/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4/bookworm/cli/Dockerfile b/8.4/bookworm/cli/Dockerfile index d707e3163..b7c67c0e3 100644 --- a/8.4/bookworm/cli/Dockerfile +++ b/8.4/bookworm/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4/bookworm/fpm/Dockerfile b/8.4/bookworm/fpm/Dockerfile index dc3e3b1bc..09eb1c0a7 100644 --- a/8.4/bookworm/fpm/Dockerfile +++ b/8.4/bookworm/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -226,20 +228,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.4/bookworm/zts/Dockerfile b/8.4/bookworm/zts/Dockerfile index b26ac83f6..f4e59f305 100644 --- a/8.4/bookworm/zts/Dockerfile +++ b/8.4/bookworm/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4/trixie/apache/Dockerfile b/8.4/trixie/apache/Dockerfile index 70e598a23..a1c02dce2 100644 --- a/8.4/trixie/apache/Dockerfile +++ b/8.4/trixie/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4/trixie/cli/Dockerfile b/8.4/trixie/cli/Dockerfile index a6ba243d4..aa633521a 100644 --- a/8.4/trixie/cli/Dockerfile +++ b/8.4/trixie/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.4/trixie/fpm/Dockerfile b/8.4/trixie/fpm/Dockerfile index f71ef31f0..b9dfc778a 100644 --- a/8.4/trixie/fpm/Dockerfile +++ b/8.4/trixie/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -226,20 +228,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.4/trixie/zts/Dockerfile b/8.4/trixie/zts/Dockerfile index 5193a50c5..733df52ba 100644 --- a/8.4/trixie/zts/Dockerfile +++ b/8.4/trixie/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5-rc/alpine3.22/cli/Dockerfile b/8.5-rc/alpine3.22/cli/Dockerfile index 0b50272a4..53f1bc432 100644 --- a/8.5-rc/alpine3.22/cli/Dockerfile +++ b/8.5-rc/alpine3.22/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5-rc/alpine3.22/fpm/Dockerfile b/8.5-rc/alpine3.22/fpm/Dockerfile index b74206144..edc970292 100644 --- a/8.5-rc/alpine3.22/fpm/Dockerfile +++ b/8.5-rc/alpine3.22/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -206,20 +208,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.5-rc/alpine3.22/zts/Dockerfile b/8.5-rc/alpine3.22/zts/Dockerfile index 05df6d73f..38954125c 100644 --- a/8.5-rc/alpine3.22/zts/Dockerfile +++ b/8.5-rc/alpine3.22/zts/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5-rc/alpine3.23/cli/Dockerfile b/8.5-rc/alpine3.23/cli/Dockerfile index 0a9e258be..e5a15b2db 100644 --- a/8.5-rc/alpine3.23/cli/Dockerfile +++ b/8.5-rc/alpine3.23/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5-rc/alpine3.23/fpm/Dockerfile b/8.5-rc/alpine3.23/fpm/Dockerfile index cbef0870b..e79cf1a82 100644 --- a/8.5-rc/alpine3.23/fpm/Dockerfile +++ b/8.5-rc/alpine3.23/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -206,20 +208,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.5-rc/alpine3.23/zts/Dockerfile b/8.5-rc/alpine3.23/zts/Dockerfile index 69f77e650..f5135f32a 100644 --- a/8.5-rc/alpine3.23/zts/Dockerfile +++ b/8.5-rc/alpine3.23/zts/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5-rc/bookworm/apache/Dockerfile b/8.5-rc/bookworm/apache/Dockerfile index 365944759..4dcd8f106 100644 --- a/8.5-rc/bookworm/apache/Dockerfile +++ b/8.5-rc/bookworm/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5-rc/bookworm/cli/Dockerfile b/8.5-rc/bookworm/cli/Dockerfile index c54237734..d13ae7207 100644 --- a/8.5-rc/bookworm/cli/Dockerfile +++ b/8.5-rc/bookworm/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5-rc/bookworm/fpm/Dockerfile b/8.5-rc/bookworm/fpm/Dockerfile index 5faf676ee..db73defa2 100644 --- a/8.5-rc/bookworm/fpm/Dockerfile +++ b/8.5-rc/bookworm/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -223,20 +225,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.5-rc/bookworm/zts/Dockerfile b/8.5-rc/bookworm/zts/Dockerfile index 51b7d7542..57e9ef6c9 100644 --- a/8.5-rc/bookworm/zts/Dockerfile +++ b/8.5-rc/bookworm/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5-rc/trixie/apache/Dockerfile b/8.5-rc/trixie/apache/Dockerfile index 265899e8c..96231e098 100644 --- a/8.5-rc/trixie/apache/Dockerfile +++ b/8.5-rc/trixie/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5-rc/trixie/cli/Dockerfile b/8.5-rc/trixie/cli/Dockerfile index b91eec89c..a0e166c9d 100644 --- a/8.5-rc/trixie/cli/Dockerfile +++ b/8.5-rc/trixie/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5-rc/trixie/fpm/Dockerfile b/8.5-rc/trixie/fpm/Dockerfile index fce455619..2dc2d3162 100644 --- a/8.5-rc/trixie/fpm/Dockerfile +++ b/8.5-rc/trixie/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -223,20 +225,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.5-rc/trixie/zts/Dockerfile b/8.5-rc/trixie/zts/Dockerfile index 3bfec82c2..d16bfe718 100644 --- a/8.5-rc/trixie/zts/Dockerfile +++ b/8.5-rc/trixie/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5/alpine3.22/cli/Dockerfile b/8.5/alpine3.22/cli/Dockerfile index dc86405b0..e55305db4 100644 --- a/8.5/alpine3.22/cli/Dockerfile +++ b/8.5/alpine3.22/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5/alpine3.22/fpm/Dockerfile b/8.5/alpine3.22/fpm/Dockerfile index 105702c12..134369ec5 100644 --- a/8.5/alpine3.22/fpm/Dockerfile +++ b/8.5/alpine3.22/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -206,20 +208,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.5/alpine3.22/zts/Dockerfile b/8.5/alpine3.22/zts/Dockerfile index 945aa8c9a..b2bd824b2 100644 --- a/8.5/alpine3.22/zts/Dockerfile +++ b/8.5/alpine3.22/zts/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5/alpine3.23/cli/Dockerfile b/8.5/alpine3.23/cli/Dockerfile index 01db63ab4..5403b042c 100644 --- a/8.5/alpine3.23/cli/Dockerfile +++ b/8.5/alpine3.23/cli/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5/alpine3.23/fpm/Dockerfile b/8.5/alpine3.23/fpm/Dockerfile index 5d48d6817..a39a8aae9 100644 --- a/8.5/alpine3.23/fpm/Dockerfile +++ b/8.5/alpine3.23/fpm/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -206,20 +208,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.5/alpine3.23/zts/Dockerfile b/8.5/alpine3.23/zts/Dockerfile index 492943b0e..fced930b3 100644 --- a/8.5/alpine3.23/zts/Dockerfile +++ b/8.5/alpine3.23/zts/Dockerfile @@ -116,8 +116,10 @@ RUN set -eux; \ docker-php-source extract; \ cd /usr/src/php; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5/bookworm/apache/Dockerfile b/8.5/bookworm/apache/Dockerfile index eac29b026..cc6ad5c24 100644 --- a/8.5/bookworm/apache/Dockerfile +++ b/8.5/bookworm/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5/bookworm/cli/Dockerfile b/8.5/bookworm/cli/Dockerfile index 5c92ec020..8f0ac2c06 100644 --- a/8.5/bookworm/cli/Dockerfile +++ b/8.5/bookworm/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5/bookworm/fpm/Dockerfile b/8.5/bookworm/fpm/Dockerfile index 11ecb4811..123972fe2 100644 --- a/8.5/bookworm/fpm/Dockerfile +++ b/8.5/bookworm/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -223,20 +225,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.5/bookworm/zts/Dockerfile b/8.5/bookworm/zts/Dockerfile index d83896d8d..385b7208b 100644 --- a/8.5/bookworm/zts/Dockerfile +++ b/8.5/bookworm/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5/trixie/apache/Dockerfile b/8.5/trixie/apache/Dockerfile index da812f910..915ea410a 100644 --- a/8.5/trixie/apache/Dockerfile +++ b/8.5/trixie/apache/Dockerfile @@ -188,8 +188,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5/trixie/cli/Dockerfile b/8.5/trixie/cli/Dockerfile index 3db1f59fe..ce00ce7fa 100644 --- a/8.5/trixie/cli/Dockerfile +++ b/8.5/trixie/cli/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/8.5/trixie/fpm/Dockerfile b/8.5/trixie/fpm/Dockerfile index 434465d41..950a07e4b 100644 --- a/8.5/trixie/fpm/Dockerfile +++ b/8.5/trixie/fpm/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -223,20 +225,11 @@ ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/8.5/trixie/zts/Dockerfile b/8.5/trixie/zts/Dockerfile index f99f8d550..16ed30b9f 100644 --- a/8.5/trixie/zts/Dockerfile +++ b/8.5/trixie/zts/Dockerfile @@ -127,8 +127,10 @@ RUN set -eux; \ if [ ! -d /usr/include/curl ]; then \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 38d3f12a4..f4df96f78 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -370,8 +370,10 @@ RUN set -eux; \ ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ fi; \ {{ ) end -}} + test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \ ./configure \ --build="$gnuArch" \ + --sysconfdir="${PHP_INI_DIR%/php}" \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ @@ -544,20 +546,11 @@ EXPOSE 80 WORKDIR /var/www/html RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ + cd "${PHP_INI_DIR%/php}"; \ + \ + cp -v php-fpm.conf.default php-fpm.conf; \ + cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \