From 80ed1289ef4d7830da6b83bc1622694eacca1a86 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 4 Jul 2025 09:12:10 +0100 Subject: [PATCH 1/2] Bumping version to 7.4.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6b0e58e..cb1d621 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.4.1 \ No newline at end of file +7.4.2 \ No newline at end of file From 72d86faab249f278c0e4efcc09e4455e7e6a7ee6 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 4 Jul 2025 10:04:38 +0100 Subject: [PATCH 2/2] Using latest base images --- 7.4/Dockerfile | 4 ++-- 8.0/Dockerfile | 4 ++-- 8.1/Dockerfile | 4 ++-- 8.2/Dockerfile | 4 ++-- 8.2/overlay/tmp/PHP_BUILD | 2 +- 8.2/overlay/tmp/PHP_REVISION | 2 +- 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 ++-- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index a22ccb7..a24604f 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.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.2 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.2 AS final +FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.4 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 9f20b12..7de7846 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.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.2 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.2 AS final +FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.4 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 e27257e..8e7d080 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.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.2 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.2 AS final +FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.4 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 15648b6..f661376 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.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.2 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.2 AS final +FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.4 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.2/overlay/tmp/PHP_BUILD b/8.2/overlay/tmp/PHP_BUILD index 72639e7..6d64c12 100644 --- a/8.2/overlay/tmp/PHP_BUILD +++ b/8.2/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.2.28-r1 \ No newline at end of file +8.2.29-r0 \ No newline at end of file diff --git a/8.2/overlay/tmp/PHP_REVISION b/8.2/overlay/tmp/PHP_REVISION index 8feaf39..5cc36b9 100644 --- a/8.2/overlay/tmp/PHP_REVISION +++ b/8.2/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.2.28 \ No newline at end of file +8.2.29 \ No newline at end of file diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 389a697..3be3dde 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.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.2 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.2 AS final +FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.4 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 a38b556..d9fdccb 100644 --- a/8.3/overlay/tmp/PHP_BUILD +++ b/8.3/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.3.22-r0 \ No newline at end of file +8.3.23-r0 \ No newline at end of file diff --git a/8.3/overlay/tmp/PHP_REVISION b/8.3/overlay/tmp/PHP_REVISION index ea62321..988324c 100644 --- a/8.3/overlay/tmp/PHP_REVISION +++ b/8.3/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.3.22 \ No newline at end of file +8.3.23 \ No newline at end of file diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 8007e0d..8050d39 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.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.2 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.2 AS final +FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.4 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 a1b4beb..9dd2e93 100644 --- a/8.4/overlay/tmp/PHP_BUILD +++ b/8.4/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.4.8-r0 \ No newline at end of file +8.4.10-r0 \ No newline at end of file diff --git a/8.4/overlay/tmp/PHP_REVISION b/8.4/overlay/tmp/PHP_REVISION index 5ceea6d..c09008c 100644 --- a/8.4/overlay/tmp/PHP_REVISION +++ b/8.4/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.4.8 \ No newline at end of file +8.4.10 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index e1cb5e4..59bfc3b 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.5.2" -PHP_BRANCH="v2.4.1" +BASE_VERSION="6.5.4" +PHP_BRANCH="v2.4.2" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4" for V in ${PHP_VERSIONS} ; do