From d9ef9867bc9d36f32530fcc81808ca0021043cd1 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Mon, 15 Dec 2025 15:36:04 -0800 Subject: [PATCH 1/2] Move fpm listen for easier config override --- 8.2/alpine3.22/fpm/Dockerfile | 27 +++++++++++---------------- 8.2/alpine3.23/fpm/Dockerfile | 27 +++++++++++---------------- 8.2/bookworm/fpm/Dockerfile | 27 +++++++++++---------------- 8.2/trixie/fpm/Dockerfile | 27 +++++++++++---------------- 8.3-rc/alpine3.22/fpm/Dockerfile | 27 +++++++++++---------------- 8.3-rc/alpine3.23/fpm/Dockerfile | 27 +++++++++++---------------- 8.3-rc/bookworm/fpm/Dockerfile | 27 +++++++++++---------------- 8.3-rc/trixie/fpm/Dockerfile | 27 +++++++++++---------------- 8.3/alpine3.22/fpm/Dockerfile | 27 +++++++++++---------------- 8.3/alpine3.23/fpm/Dockerfile | 27 +++++++++++---------------- 8.3/bookworm/fpm/Dockerfile | 27 +++++++++++---------------- 8.3/trixie/fpm/Dockerfile | 27 +++++++++++---------------- 8.4-rc/alpine3.22/fpm/Dockerfile | 27 +++++++++++---------------- 8.4-rc/alpine3.23/fpm/Dockerfile | 27 +++++++++++---------------- 8.4-rc/bookworm/fpm/Dockerfile | 27 +++++++++++---------------- 8.4-rc/trixie/fpm/Dockerfile | 27 +++++++++++---------------- 8.4/alpine3.22/fpm/Dockerfile | 27 +++++++++++---------------- 8.4/alpine3.23/fpm/Dockerfile | 27 +++++++++++---------------- 8.4/bookworm/fpm/Dockerfile | 27 +++++++++++---------------- 8.4/trixie/fpm/Dockerfile | 27 +++++++++++---------------- 8.5-rc/alpine3.22/fpm/Dockerfile | 27 +++++++++++---------------- 8.5-rc/alpine3.23/fpm/Dockerfile | 27 +++++++++++---------------- 8.5-rc/bookworm/fpm/Dockerfile | 27 +++++++++++---------------- 8.5-rc/trixie/fpm/Dockerfile | 27 +++++++++++---------------- 8.5/alpine3.22/fpm/Dockerfile | 27 +++++++++++---------------- 8.5/alpine3.23/fpm/Dockerfile | 27 +++++++++++---------------- 8.5/bookworm/fpm/Dockerfile | 27 +++++++++++---------------- 8.5/trixie/fpm/Dockerfile | 27 +++++++++++---------------- Dockerfile-linux.template | 27 +++++++++++---------------- 29 files changed, 319 insertions(+), 464 deletions(-) diff --git a/8.2/alpine3.22/fpm/Dockerfile b/8.2/alpine3.22/fpm/Dockerfile index 93b4f2119..e361f99b8 100644 --- a/8.2/alpine3.22/fpm/Dockerfile +++ b/8.2/alpine3.22/fpm/Dockerfile @@ -214,19 +214,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -242,13 +237,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.2/alpine3.23/fpm/Dockerfile b/8.2/alpine3.23/fpm/Dockerfile index 91c18ed3a..8c6f40e58 100644 --- a/8.2/alpine3.23/fpm/Dockerfile +++ b/8.2/alpine3.23/fpm/Dockerfile @@ -214,19 +214,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -242,13 +237,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.2/bookworm/fpm/Dockerfile b/8.2/bookworm/fpm/Dockerfile index ef0ad238c..f079de287 100644 --- a/8.2/bookworm/fpm/Dockerfile +++ b/8.2/bookworm/fpm/Dockerfile @@ -231,19 +231,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -259,13 +254,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.2/trixie/fpm/Dockerfile b/8.2/trixie/fpm/Dockerfile index c89d8a1af..9c75d77f2 100644 --- a/8.2/trixie/fpm/Dockerfile +++ b/8.2/trixie/fpm/Dockerfile @@ -231,19 +231,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -259,13 +254,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.3-rc/alpine3.22/fpm/Dockerfile b/8.3-rc/alpine3.22/fpm/Dockerfile index 0cef10078..66d65a2cd 100644 --- a/8.3-rc/alpine3.22/fpm/Dockerfile +++ b/8.3-rc/alpine3.22/fpm/Dockerfile @@ -210,19 +210,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -238,13 +233,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.3-rc/alpine3.23/fpm/Dockerfile b/8.3-rc/alpine3.23/fpm/Dockerfile index 7a2fee320..8abdffc22 100644 --- a/8.3-rc/alpine3.23/fpm/Dockerfile +++ b/8.3-rc/alpine3.23/fpm/Dockerfile @@ -210,19 +210,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -238,13 +233,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.3-rc/bookworm/fpm/Dockerfile b/8.3-rc/bookworm/fpm/Dockerfile index 9825667d0..4c1fa6026 100644 --- a/8.3-rc/bookworm/fpm/Dockerfile +++ b/8.3-rc/bookworm/fpm/Dockerfile @@ -227,19 +227,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -255,13 +250,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.3-rc/trixie/fpm/Dockerfile b/8.3-rc/trixie/fpm/Dockerfile index 40f73c52f..ad9a24fe8 100644 --- a/8.3-rc/trixie/fpm/Dockerfile +++ b/8.3-rc/trixie/fpm/Dockerfile @@ -227,19 +227,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -255,13 +250,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.3/alpine3.22/fpm/Dockerfile b/8.3/alpine3.22/fpm/Dockerfile index 9ebe528c1..b8c4226e3 100644 --- a/8.3/alpine3.22/fpm/Dockerfile +++ b/8.3/alpine3.22/fpm/Dockerfile @@ -210,19 +210,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -238,13 +233,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.3/alpine3.23/fpm/Dockerfile b/8.3/alpine3.23/fpm/Dockerfile index f8506fdb0..30a617d67 100644 --- a/8.3/alpine3.23/fpm/Dockerfile +++ b/8.3/alpine3.23/fpm/Dockerfile @@ -210,19 +210,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -238,13 +233,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.3/bookworm/fpm/Dockerfile b/8.3/bookworm/fpm/Dockerfile index 9325ac7f3..34364b894 100644 --- a/8.3/bookworm/fpm/Dockerfile +++ b/8.3/bookworm/fpm/Dockerfile @@ -227,19 +227,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -255,13 +250,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.3/trixie/fpm/Dockerfile b/8.3/trixie/fpm/Dockerfile index 74fb7de22..35c663c40 100644 --- a/8.3/trixie/fpm/Dockerfile +++ b/8.3/trixie/fpm/Dockerfile @@ -227,19 +227,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -255,13 +250,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.4-rc/alpine3.22/fpm/Dockerfile b/8.4-rc/alpine3.22/fpm/Dockerfile index 9cd71acb3..e858a8d88 100644 --- a/8.4-rc/alpine3.22/fpm/Dockerfile +++ b/8.4-rc/alpine3.22/fpm/Dockerfile @@ -210,19 +210,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -238,13 +233,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.4-rc/alpine3.23/fpm/Dockerfile b/8.4-rc/alpine3.23/fpm/Dockerfile index 471be77e3..4e870bc6f 100644 --- a/8.4-rc/alpine3.23/fpm/Dockerfile +++ b/8.4-rc/alpine3.23/fpm/Dockerfile @@ -210,19 +210,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -238,13 +233,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.4-rc/bookworm/fpm/Dockerfile b/8.4-rc/bookworm/fpm/Dockerfile index bea1341b8..e63fceb7a 100644 --- a/8.4-rc/bookworm/fpm/Dockerfile +++ b/8.4-rc/bookworm/fpm/Dockerfile @@ -227,19 +227,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -255,13 +250,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.4-rc/trixie/fpm/Dockerfile b/8.4-rc/trixie/fpm/Dockerfile index 6e842c020..adb64fa00 100644 --- a/8.4-rc/trixie/fpm/Dockerfile +++ b/8.4-rc/trixie/fpm/Dockerfile @@ -227,19 +227,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -255,13 +250,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.4/alpine3.22/fpm/Dockerfile b/8.4/alpine3.22/fpm/Dockerfile index 64719f524..8a6ab0312 100644 --- a/8.4/alpine3.22/fpm/Dockerfile +++ b/8.4/alpine3.22/fpm/Dockerfile @@ -210,19 +210,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -238,13 +233,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.4/alpine3.23/fpm/Dockerfile b/8.4/alpine3.23/fpm/Dockerfile index 598fc0caf..399cbb7c0 100644 --- a/8.4/alpine3.23/fpm/Dockerfile +++ b/8.4/alpine3.23/fpm/Dockerfile @@ -210,19 +210,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -238,13 +233,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.4/bookworm/fpm/Dockerfile b/8.4/bookworm/fpm/Dockerfile index e5a1f469c..6252adee1 100644 --- a/8.4/bookworm/fpm/Dockerfile +++ b/8.4/bookworm/fpm/Dockerfile @@ -227,19 +227,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -255,13 +250,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.4/trixie/fpm/Dockerfile b/8.4/trixie/fpm/Dockerfile index 31c5a5f72..25f595bf7 100644 --- a/8.4/trixie/fpm/Dockerfile +++ b/8.4/trixie/fpm/Dockerfile @@ -227,19 +227,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -255,13 +250,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.5-rc/alpine3.22/fpm/Dockerfile b/8.5-rc/alpine3.22/fpm/Dockerfile index 2f734f7b8..03e5859cb 100644 --- a/8.5-rc/alpine3.22/fpm/Dockerfile +++ b/8.5-rc/alpine3.22/fpm/Dockerfile @@ -207,19 +207,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -235,13 +230,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.5-rc/alpine3.23/fpm/Dockerfile b/8.5-rc/alpine3.23/fpm/Dockerfile index ae932946d..7a2d665fb 100644 --- a/8.5-rc/alpine3.23/fpm/Dockerfile +++ b/8.5-rc/alpine3.23/fpm/Dockerfile @@ -207,19 +207,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -235,13 +230,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.5-rc/bookworm/fpm/Dockerfile b/8.5-rc/bookworm/fpm/Dockerfile index d6471342a..cdff1cd88 100644 --- a/8.5-rc/bookworm/fpm/Dockerfile +++ b/8.5-rc/bookworm/fpm/Dockerfile @@ -224,19 +224,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -252,13 +247,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.5-rc/trixie/fpm/Dockerfile b/8.5-rc/trixie/fpm/Dockerfile index 4056963e1..a8fabe9d9 100644 --- a/8.5-rc/trixie/fpm/Dockerfile +++ b/8.5-rc/trixie/fpm/Dockerfile @@ -224,19 +224,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -252,13 +247,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.5/alpine3.22/fpm/Dockerfile b/8.5/alpine3.22/fpm/Dockerfile index d9704c0fe..3efc000ed 100644 --- a/8.5/alpine3.22/fpm/Dockerfile +++ b/8.5/alpine3.22/fpm/Dockerfile @@ -207,19 +207,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -235,13 +230,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.5/alpine3.23/fpm/Dockerfile b/8.5/alpine3.23/fpm/Dockerfile index 87efe7992..44cd66c57 100644 --- a/8.5/alpine3.23/fpm/Dockerfile +++ b/8.5/alpine3.23/fpm/Dockerfile @@ -207,19 +207,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -235,13 +230,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.5/bookworm/fpm/Dockerfile b/8.5/bookworm/fpm/Dockerfile index d4aa3044a..02dda1861 100644 --- a/8.5/bookworm/fpm/Dockerfile +++ b/8.5/bookworm/fpm/Dockerfile @@ -224,19 +224,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -252,13 +247,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.5/trixie/fpm/Dockerfile b/8.5/trixie/fpm/Dockerfile index fd28a102f..d90ed64ee 100644 --- a/8.5/trixie/fpm/Dockerfile +++ b/8.5/trixie/fpm/Dockerfile @@ -224,19 +224,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -252,13 +247,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 6df0df720..94b066a17 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -505,19 +505,14 @@ 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; \ + # 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; \ + \ + # comment out localhost-only listen address + grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ + sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ + grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -533,13 +528,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ + echo; \ + echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ From cd6d8d01cc8eed1a2e3fce89f64e206637da3e3d Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Wed, 7 Jan 2026 14:27:35 -0800 Subject: [PATCH 2/2] Limit fpm listen change to the next patch releases --- 8.2/alpine3.22/fpm/Dockerfile | 11 +++-------- 8.2/alpine3.23/fpm/Dockerfile | 11 +++-------- 8.2/bookworm/fpm/Dockerfile | 11 +++-------- 8.2/trixie/fpm/Dockerfile | 11 +++-------- 8.3/alpine3.22/fpm/Dockerfile | 11 +++-------- 8.3/alpine3.23/fpm/Dockerfile | 11 +++-------- 8.3/bookworm/fpm/Dockerfile | 11 +++-------- 8.3/trixie/fpm/Dockerfile | 11 +++-------- 8.4/alpine3.22/fpm/Dockerfile | 11 +++-------- 8.4/alpine3.23/fpm/Dockerfile | 11 +++-------- 8.4/bookworm/fpm/Dockerfile | 11 +++-------- 8.4/trixie/fpm/Dockerfile | 11 +++-------- 8.5/alpine3.22/fpm/Dockerfile | 11 +++-------- 8.5/alpine3.23/fpm/Dockerfile | 11 +++-------- 8.5/bookworm/fpm/Dockerfile | 11 +++-------- 8.5/trixie/fpm/Dockerfile | 11 +++-------- Dockerfile-linux.template | 9 +++++++++ 17 files changed, 57 insertions(+), 128 deletions(-) diff --git a/8.2/alpine3.22/fpm/Dockerfile b/8.2/alpine3.22/fpm/Dockerfile index e361f99b8..f15b5f097 100644 --- a/8.2/alpine3.22/fpm/Dockerfile +++ b/8.2/alpine3.22/fpm/Dockerfile @@ -217,11 +217,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -237,13 +232,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.2/alpine3.23/fpm/Dockerfile b/8.2/alpine3.23/fpm/Dockerfile index 8c6f40e58..aae042c20 100644 --- a/8.2/alpine3.23/fpm/Dockerfile +++ b/8.2/alpine3.23/fpm/Dockerfile @@ -217,11 +217,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -237,13 +232,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.2/bookworm/fpm/Dockerfile b/8.2/bookworm/fpm/Dockerfile index f079de287..11e5ba363 100644 --- a/8.2/bookworm/fpm/Dockerfile +++ b/8.2/bookworm/fpm/Dockerfile @@ -234,11 +234,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -254,13 +249,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.2/trixie/fpm/Dockerfile b/8.2/trixie/fpm/Dockerfile index 9c75d77f2..d774bfb8c 100644 --- a/8.2/trixie/fpm/Dockerfile +++ b/8.2/trixie/fpm/Dockerfile @@ -234,11 +234,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -254,13 +249,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.3/alpine3.22/fpm/Dockerfile b/8.3/alpine3.22/fpm/Dockerfile index b8c4226e3..538f6111c 100644 --- a/8.3/alpine3.22/fpm/Dockerfile +++ b/8.3/alpine3.22/fpm/Dockerfile @@ -213,11 +213,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -233,13 +228,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.3/alpine3.23/fpm/Dockerfile b/8.3/alpine3.23/fpm/Dockerfile index 30a617d67..59152aa59 100644 --- a/8.3/alpine3.23/fpm/Dockerfile +++ b/8.3/alpine3.23/fpm/Dockerfile @@ -213,11 +213,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -233,13 +228,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.3/bookworm/fpm/Dockerfile b/8.3/bookworm/fpm/Dockerfile index 34364b894..9472f9aa9 100644 --- a/8.3/bookworm/fpm/Dockerfile +++ b/8.3/bookworm/fpm/Dockerfile @@ -230,11 +230,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -250,13 +245,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.3/trixie/fpm/Dockerfile b/8.3/trixie/fpm/Dockerfile index 35c663c40..dedecbdc1 100644 --- a/8.3/trixie/fpm/Dockerfile +++ b/8.3/trixie/fpm/Dockerfile @@ -230,11 +230,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -250,13 +245,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.4/alpine3.22/fpm/Dockerfile b/8.4/alpine3.22/fpm/Dockerfile index 8a6ab0312..905786a35 100644 --- a/8.4/alpine3.22/fpm/Dockerfile +++ b/8.4/alpine3.22/fpm/Dockerfile @@ -213,11 +213,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -233,13 +228,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.4/alpine3.23/fpm/Dockerfile b/8.4/alpine3.23/fpm/Dockerfile index 399cbb7c0..bd52fd13b 100644 --- a/8.4/alpine3.23/fpm/Dockerfile +++ b/8.4/alpine3.23/fpm/Dockerfile @@ -213,11 +213,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -233,13 +228,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.4/bookworm/fpm/Dockerfile b/8.4/bookworm/fpm/Dockerfile index 6252adee1..4d1ce4617 100644 --- a/8.4/bookworm/fpm/Dockerfile +++ b/8.4/bookworm/fpm/Dockerfile @@ -230,11 +230,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -250,13 +245,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.4/trixie/fpm/Dockerfile b/8.4/trixie/fpm/Dockerfile index 25f595bf7..1b6b8433b 100644 --- a/8.4/trixie/fpm/Dockerfile +++ b/8.4/trixie/fpm/Dockerfile @@ -230,11 +230,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -250,13 +245,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.5/alpine3.22/fpm/Dockerfile b/8.5/alpine3.22/fpm/Dockerfile index 3efc000ed..e12849984 100644 --- a/8.5/alpine3.22/fpm/Dockerfile +++ b/8.5/alpine3.22/fpm/Dockerfile @@ -210,11 +210,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -230,13 +225,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.5/alpine3.23/fpm/Dockerfile b/8.5/alpine3.23/fpm/Dockerfile index 44cd66c57..35eeea785 100644 --- a/8.5/alpine3.23/fpm/Dockerfile +++ b/8.5/alpine3.23/fpm/Dockerfile @@ -210,11 +210,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -230,13 +225,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.5/bookworm/fpm/Dockerfile b/8.5/bookworm/fpm/Dockerfile index 02dda1861..a5cced84d 100644 --- a/8.5/bookworm/fpm/Dockerfile +++ b/8.5/bookworm/fpm/Dockerfile @@ -227,11 +227,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -247,13 +242,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/8.5/trixie/fpm/Dockerfile b/8.5/trixie/fpm/Dockerfile index d90ed64ee..edf47a203 100644 --- a/8.5/trixie/fpm/Dockerfile +++ b/8.5/trixie/fpm/Dockerfile @@ -227,11 +227,6 @@ RUN set -eux; \ # 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; \ - \ - # comment out localhost-only listen address - grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ - sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ - grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -247,13 +242,13 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ - echo; \ - echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ - echo 'listen = 9000'; \ } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 94b066a17..eae47d0d4 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -508,11 +508,13 @@ RUN set -eux; \ # 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; \ +{{ if .version | IN("8.2.30", "8.3.29", "8.4.16", "8.5.1") then "" else ( -}} \ # comment out localhost-only listen address grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \ +{{ ) end -}} { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ @@ -528,13 +530,20 @@ RUN set -eux; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo 'catch_workers_output = yes'; \ echo 'decorate_workers_output = no'; \ +{{ if .version | IN("8.2.30", "8.3.29", "8.4.16", "8.5.1") then "" else ( -}} echo; \ echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \ echo 'listen = 9000'; \ +{{ ) end -}} } | tee php-fpm.d/docker.conf; \ { \ echo '[global]'; \ echo 'daemonize = no'; \ +{{ if .version | IN("8.2.30", "8.3.29", "8.4.16", "8.5.1") then ( -}} + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ +{{ ) else "" end -}} } | tee php-fpm.d/zz-docker.conf; \ mkdir -p "$PHP_INI_DIR/conf.d"; \ { \