From 3a7b12720fd3efbf234cd094b455e9bdfa3655e5 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 20 Aug 2025 09:47:04 +0100 Subject: [PATCH 1/4] Bumping version to 7.4.4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a263a9c..c74107f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.4.3 \ No newline at end of file +7.4.4 \ No newline at end of file From 3a4f2891e4834293b8fb6e11733e668a31be2ef3 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 20 Aug 2025 09:47:11 +0100 Subject: [PATCH 2/4] Switching --ignore-errors to --optional for get --- overlay/etc/nu/scripts/bf-nginx-php/sessions.nu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/etc/nu/scripts/bf-nginx-php/sessions.nu b/overlay/etc/nu/scripts/bf-nginx-php/sessions.nu index 177f3f2..60b5c08 100644 --- a/overlay/etc/nu/scripts/bf-nginx-php/sessions.nu +++ b/overlay/etc/nu/scripts/bf-nginx-php/sessions.nu @@ -8,7 +8,7 @@ export def clean [] { # get session max lifetime (if set) let ini_override = bf env PHP_INI_OVERRIDE let max_lifetime = match ($ini_override | path exists) { - true => ($ini_override | open | get --ignore-errors "session.gc_maxlifetime") + true => ($ini_override | open | get --optional "session.gc_maxlifetime") false => 86400 } From 6c4f23b9dbf525708953aa7ae8ee7694ecbc86e5 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 20 Aug 2025 10:24:16 +0100 Subject: [PATCH 3/4] Using latest base images --- 7.4/Dockerfile | 4 ++-- 8.0/Dockerfile | 4 ++-- 8.1/Dockerfile | 4 ++-- 8.2/Dockerfile | 4 ++-- 8.3/Dockerfile | 4 ++-- 8.4/Dockerfile | 4 ++-- generate-dockerfiles.sh | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index ce2b268..f6ddf91 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.4 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.4 AS final +FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.5 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 ff4bf3e..cfff7fe 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.4 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.4 AS final +FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.5 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 160d20e..08ded61 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.4 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.4 AS final +FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.5 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 fb97314..2085321 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.4 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.4 AS final +FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.5 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 70f834d..0ac0972 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.4 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.4 AS final +FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.5 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 90e22b4..c8b7437 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.4 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.4 AS final +FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.5 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 5dd6782..e9c0a58 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.5.4" -PHP_BRANCH="v2.4.3" +BASE_VERSION="6.5.5" +PHP_BRANCH="v2.4.4" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4" for V in ${PHP_VERSIONS} ; do From 030c8258db577f95aba318d1ecbe2956d7bcf50b Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 20 Aug 2025 10:24:41 +0100 Subject: [PATCH 4/4] Updating to PHP 8.3.24 and 8.4.11 --- 8.3/overlay/tmp/PHP_BUILD | 2 +- 8.3/overlay/tmp/PHP_REVISION | 2 +- 8.4/overlay/tmp/PHP_BUILD | 2 +- 8.4/overlay/tmp/PHP_REVISION | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/8.3/overlay/tmp/PHP_BUILD b/8.3/overlay/tmp/PHP_BUILD index d9fdccb..781b64f 100644 --- a/8.3/overlay/tmp/PHP_BUILD +++ b/8.3/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.3.23-r0 \ No newline at end of file +8.3.24-r0 \ No newline at end of file diff --git a/8.3/overlay/tmp/PHP_REVISION b/8.3/overlay/tmp/PHP_REVISION index 988324c..99d3391 100644 --- a/8.3/overlay/tmp/PHP_REVISION +++ b/8.3/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.3.23 \ No newline at end of file +8.3.24 \ No newline at end of file diff --git a/8.4/overlay/tmp/PHP_BUILD b/8.4/overlay/tmp/PHP_BUILD index 9dd2e93..dab697b 100644 --- a/8.4/overlay/tmp/PHP_BUILD +++ b/8.4/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.4.10-r0 \ No newline at end of file +8.4.11-r0 \ No newline at end of file diff --git a/8.4/overlay/tmp/PHP_REVISION b/8.4/overlay/tmp/PHP_REVISION index c09008c..95862d6 100644 --- a/8.4/overlay/tmp/PHP_REVISION +++ b/8.4/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.4.10 \ No newline at end of file +8.4.11 \ No newline at end of file