From f08ca72cc8e6e2af43d2b3c3dc0b3d2310b3593b Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 12 Sep 2025 14:15:26 +0100 Subject: [PATCH 1/3] Bumping version to 7.5.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7501d50..26fb97c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.5.1 \ No newline at end of file +7.5.2 \ No newline at end of file From 1a0f3c87e8a8d7f56700d36a75f2b388a28b0de7 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 12 Sep 2025 14:15:46 +0100 Subject: [PATCH 2/3] Return nothing from init scripts to avoid empty list output during startup --- overlay/etc/bf/init.d/22-php-ini.nu | 3 +++ overlay/etc/bf/init.d/23-www-conf.nu | 3 +++ 2 files changed, 6 insertions(+) diff --git a/overlay/etc/bf/init.d/22-php-ini.nu b/overlay/etc/bf/init.d/22-php-ini.nu index 80daf96..a52f7e2 100644 --- a/overlay/etc/bf/init.d/22-php-ini.nu +++ b/overlay/etc/bf/init.d/22-php-ini.nu @@ -10,4 +10,7 @@ export def main [] { let override_values = bf fs read $x | from json bf-php ini $override_values } } + + # return nothing + return } diff --git a/overlay/etc/bf/init.d/23-www-conf.nu b/overlay/etc/bf/init.d/23-www-conf.nu index 2737069..ccfea83 100644 --- a/overlay/etc/bf/init.d/23-www-conf.nu +++ b/overlay/etc/bf/init.d/23-www-conf.nu @@ -15,4 +15,7 @@ export def main [] { let override_values = bf fs read $x | from json bf-php ini insert_or_replace_values_in_file $fpm_conf $override_values } } + + # return nothing + return } From 512b1ce1a6d2a5f9657aef90b695fa417ec93491 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 17 Oct 2025 11:37:19 +0100 Subject: [PATCH 3/3] Updating to PHP 8.3.26 and 8.4.13 --- 7.4/Dockerfile | 4 ++-- 8.0/Dockerfile | 4 ++-- 8.1/Dockerfile | 4 ++-- 8.2/Dockerfile | 4 ++-- 8.3/Dockerfile | 4 ++-- 8.3/overlay/tmp/PHP_BUILD | 2 +- 8.3/overlay/tmp/PHP_REVISION | 2 +- 8.4/Dockerfile | 4 ++-- 8.4/overlay/tmp/PHP_BUILD | 2 +- 8.4/overlay/tmp/PHP_REVISION | 2 +- generate-dockerfiles.sh | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 3742db9..eb5a242 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /tmp RUN \ # get the Nu scripts from the PHP image overlay echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ @@ -17,7 +17,7 @@ RUN \ # STAGE 1: create final image #====================================================================================================================== -FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.6 AS final +FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.7 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.0/Dockerfile b/8.0/Dockerfile index b212003..8aaa66a 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /tmp RUN \ # get the Nu scripts from the PHP image overlay echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ @@ -17,7 +17,7 @@ RUN \ # STAGE 1: create final image #====================================================================================================================== -FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.6 AS final +FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.7 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 6345822..ab38ee6 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /tmp RUN \ # get the Nu scripts from the PHP image overlay echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ @@ -17,7 +17,7 @@ RUN \ # STAGE 1: create final image #====================================================================================================================== -FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.6 AS final +FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.7 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 919a73e..00d122f 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /tmp RUN \ # get the Nu scripts from the PHP image overlay echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ @@ -17,7 +17,7 @@ RUN \ # STAGE 1: create final image #====================================================================================================================== -FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.6 AS final +FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 2941c8f..76331c3 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /tmp RUN \ # get the Nu scripts from the PHP image overlay echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ @@ -17,7 +17,7 @@ RUN \ # STAGE 1: create final image #====================================================================================================================== -FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.6 AS final +FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.3/overlay/tmp/PHP_BUILD b/8.3/overlay/tmp/PHP_BUILD index 781b64f..83f3c32 100644 --- a/8.3/overlay/tmp/PHP_BUILD +++ b/8.3/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.3.24-r0 \ No newline at end of file +8.3.26-r0 \ No newline at end of file diff --git a/8.3/overlay/tmp/PHP_REVISION b/8.3/overlay/tmp/PHP_REVISION index 99d3391..1ac0a74 100644 --- a/8.3/overlay/tmp/PHP_REVISION +++ b/8.3/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.3.24 \ No newline at end of file +8.3.26 \ No newline at end of file diff --git a/8.4/Dockerfile b/8.4/Dockerfile index bafc4a9..6748c82 100644 --- a/8.4/Dockerfile +++ b/8.4/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /tmp RUN \ # get the Nu scripts from the PHP image overlay echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ @@ -17,7 +17,7 @@ RUN \ # STAGE 1: create final image #====================================================================================================================== -FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.6 AS final +FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.4/overlay/tmp/PHP_BUILD b/8.4/overlay/tmp/PHP_BUILD index dab697b..8e74c11 100644 --- a/8.4/overlay/tmp/PHP_BUILD +++ b/8.4/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.4.11-r0 \ No newline at end of file +8.4.13-r0 \ No newline at end of file diff --git a/8.4/overlay/tmp/PHP_REVISION b/8.4/overlay/tmp/PHP_REVISION index 95862d6..d905563 100644 --- a/8.4/overlay/tmp/PHP_REVISION +++ b/8.4/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.4.11 \ No newline at end of file +8.4.13 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 9a11503..9b99d5c 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.5.6" -PHP_BRANCH="v2.4.5" +BASE_VERSION="6.5.7" +PHP_BRANCH="v2.4.6" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4" for V in ${PHP_VERSIONS} ; do