diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 4ae0a26..58e9edc 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 v3.1.11 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.12 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 quay.io/bfren/nginx:nginx1.20-alpine3.15-7.1.9 AS final +FROM quay.io/bfren/nginx:nginx1.20-alpine3.15-7.2.0 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 4775f54..68ca381 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 v3.1.11 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.12 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 quay.io/bfren/nginx:nginx1.22-alpine3.16-7.1.9 AS final +FROM quay.io/bfren/nginx:nginx1.22-alpine3.16-7.2.0 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 d559db2..340e8ba 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 v3.1.11 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.12 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 quay.io/bfren/nginx:nginx1.24-alpine3.19-7.1.9 AS final +FROM quay.io/bfren/nginx:nginx1.24-alpine3.19-7.2.0 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.1/overlay/tmp/PHP_BUILD b/8.1/overlay/tmp/PHP_BUILD index 3662ce7..df2ae58 100644 --- a/8.1/overlay/tmp/PHP_BUILD +++ b/8.1/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.1.32-r0 \ No newline at end of file +8.1.34-r0 \ No newline at end of file diff --git a/8.1/overlay/tmp/PHP_REVISION b/8.1/overlay/tmp/PHP_REVISION index cc20f5c..e66cace 100644 --- a/8.1/overlay/tmp/PHP_REVISION +++ b/8.1/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.1.32 \ No newline at end of file +8.1.34 \ No newline at end of file diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 4014e8e..8856681 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 v3.1.11 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.12 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 quay.io/bfren/nginx:nginx1.28-alpine3.22-7.1.9 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.2.0 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 02b9075..fe9b7c0 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 v3.1.11 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.12 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 quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.9 AS final +FROM quay.io/bfren/nginx:nginx1.30-alpine3.24-7.2.0 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.3/NGINX_BASE b/8.3/NGINX_BASE index feb3aeb..68707d6 100644 --- a/8.3/NGINX_BASE +++ b/8.3/NGINX_BASE @@ -1 +1 @@ -nginx1.28-alpine3.23 \ No newline at end of file +nginx1.30-alpine3.24 \ No newline at end of file diff --git a/8.3/overlay/tmp/PHP_BUILD b/8.3/overlay/tmp/PHP_BUILD index 969ad93..dfe9c0f 100644 --- a/8.3/overlay/tmp/PHP_BUILD +++ b/8.3/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.3.31-r0 \ No newline at end of file +8.3.31-r1 \ No newline at end of file diff --git a/8.4/Dockerfile b/8.4/Dockerfile index c9b4f25..7dd374b 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 v3.1.11 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.12 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 quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.9 AS final +FROM quay.io/bfren/nginx:nginx1.30-alpine3.24-7.2.0 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.4/NGINX_BASE b/8.4/NGINX_BASE index feb3aeb..68707d6 100644 --- a/8.4/NGINX_BASE +++ b/8.4/NGINX_BASE @@ -1 +1 @@ -nginx1.28-alpine3.23 \ No newline at end of file +nginx1.30-alpine3.24 \ No newline at end of file diff --git a/8.4/overlay/tmp/PHP_BUILD b/8.4/overlay/tmp/PHP_BUILD index 9913d65..c624ff5 100644 --- a/8.4/overlay/tmp/PHP_BUILD +++ b/8.4/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.4.21-r0 \ No newline at end of file +8.4.22-r0 \ No newline at end of file diff --git a/8.4/overlay/tmp/PHP_REVISION b/8.4/overlay/tmp/PHP_REVISION index 86c4b27..30ccbd5 100644 --- a/8.4/overlay/tmp/PHP_REVISION +++ b/8.4/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.4.21 \ No newline at end of file +8.4.22 \ No newline at end of file diff --git a/8.5/Dockerfile b/8.5/Dockerfile index 858bbd2..b89e94a 100644 --- a/8.5/Dockerfile +++ b/8.5/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 v3.1.11 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.12 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 quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.9 AS final +FROM quay.io/bfren/nginx:nginx1.30-alpine3.24-7.2.0 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.5/NGINX_BASE b/8.5/NGINX_BASE index feb3aeb..68707d6 100644 --- a/8.5/NGINX_BASE +++ b/8.5/NGINX_BASE @@ -1 +1 @@ -nginx1.28-alpine3.23 \ No newline at end of file +nginx1.30-alpine3.24 \ No newline at end of file diff --git a/8.5/overlay/tmp/PHP_BUILD b/8.5/overlay/tmp/PHP_BUILD index a632cb6..b977a6f 100644 --- a/8.5/overlay/tmp/PHP_BUILD +++ b/8.5/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.5.6-r0 \ No newline at end of file +8.5.7-r0 \ No newline at end of file diff --git a/8.5/overlay/tmp/PHP_REVISION b/8.5/overlay/tmp/PHP_REVISION index ff3215e..141b27e 100644 --- a/8.5/overlay/tmp/PHP_REVISION +++ b/8.5/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.5.6 \ No newline at end of file +8.5.7 \ No newline at end of file diff --git a/VERSION b/VERSION index 51947ed..88dee36 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.1.12 \ No newline at end of file +8.2.0 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 8d1eec6..0dc0f32 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -8.1 \ No newline at end of file +8.2 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index d1836be..0fac44c 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="7.1.9" -PHP_BRANCH="v3.1.11" +BASE_VERSION="7.2.0" +PHP_BRANCH="v3.1.12" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" for V in ${PHP_VERSIONS} ; do