diff --git a/7.4/Dockerfile b/7.4/Dockerfile index fef87af..78bd498 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.3.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.3.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.4.4 AS final +FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.4.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 0049f2c..b519259 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.3.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.3.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.4.4 AS final +FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.4.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 f8cf2e7..123a025 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.3.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.3.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.4.4 AS final +FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.4.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 def10f7..b1fcafa 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.3.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.3.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.26-alpine3.21-6.4.4 AS final +FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.21-6.4.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 fa31500..7be9382 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.3.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.3.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.26-alpine3.21-6.4.4 AS final +FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.21-6.4.5 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 4fc91c4..393a6ae 100644 --- a/8.3/overlay/tmp/PHP_BUILD +++ b/8.3/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.3.18-r0 \ No newline at end of file +8.3.19-r0 \ No newline at end of file diff --git a/8.3/overlay/tmp/PHP_REVISION b/8.3/overlay/tmp/PHP_REVISION index d54fe02..a351e1b 100644 --- a/8.3/overlay/tmp/PHP_REVISION +++ b/8.3/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.3.18 \ No newline at end of file +8.3.19 \ No newline at end of file diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 10fe2a3..9c2969b 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.3.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.3.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.26-alpine3.21-6.4.4 AS final +FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.21-6.4.5 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/VERSION b/VERSION index d84bce9..31d4a83 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.3.6 \ No newline at end of file +7.3.7 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index cddec5f..4943867 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.4.4" -PHP_BRANCH="v2.3.5" +BASE_VERSION="6.4.5" +PHP_BRANCH="v2.3.6" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4" for V in ${PHP_VERSIONS} ; do