diff --git a/7.4/Dockerfile b/7.4/Dockerfile index fac448c..fef87af 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.4 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.3.5 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.3 AS final +FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.4.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 eb7c270..0049f2c 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.4 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.3.5 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.3 AS final +FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.4.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 04c7e53..f8cf2e7 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.4 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.3.5 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.3 AS final +FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.4.4 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 46b0b14..3662ce7 100644 --- a/8.1/overlay/tmp/PHP_BUILD +++ b/8.1/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.1.31-r0 \ No newline at end of file +8.1.32-r0 \ No newline at end of file diff --git a/8.1/overlay/tmp/PHP_REVISION b/8.1/overlay/tmp/PHP_REVISION index f1b3d85..cc20f5c 100644 --- a/8.1/overlay/tmp/PHP_REVISION +++ b/8.1/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.1.31 \ No newline at end of file +8.1.32 \ No newline at end of file diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 2715619..def10f7 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.4 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.3.5 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.3 AS final +FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.21-6.4.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 acad880..d15c4a9 100644 --- a/8.2/overlay/tmp/PHP_BUILD +++ b/8.2/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.2.27-r0 \ No newline at end of file +8.2.28-r0 \ No newline at end of file diff --git a/8.2/overlay/tmp/PHP_REVISION b/8.2/overlay/tmp/PHP_REVISION index ab2d58a..8feaf39 100644 --- a/8.2/overlay/tmp/PHP_REVISION +++ b/8.2/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.2.27 \ No newline at end of file +8.2.28 \ No newline at end of file diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 1c29bf0..fa31500 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.4 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.3.5 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.3 AS final +FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.21-6.4.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 513505e..4fc91c4 100644 --- a/8.3/overlay/tmp/PHP_BUILD +++ b/8.3/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.3.17-r0 \ No newline at end of file +8.3.18-r0 \ No newline at end of file diff --git a/8.3/overlay/tmp/PHP_REVISION b/8.3/overlay/tmp/PHP_REVISION index 963d3cb..d54fe02 100644 --- a/8.3/overlay/tmp/PHP_REVISION +++ b/8.3/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.3.17 \ No newline at end of file +8.3.18 \ No newline at end of file diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 4681777..10fe2a3 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.4 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.3.5 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.3 AS final +FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.21-6.4.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 c474659..a890e55 100644 --- a/8.4/overlay/tmp/PHP_BUILD +++ b/8.4/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.4.4-r0 \ No newline at end of file +8.4.5-r0 \ No newline at end of file diff --git a/8.4/overlay/tmp/PHP_REVISION b/8.4/overlay/tmp/PHP_REVISION index 2eb8a04..007f2e6 100644 --- a/8.4/overlay/tmp/PHP_REVISION +++ b/8.4/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.4.4 \ No newline at end of file +8.4.5 \ No newline at end of file diff --git a/VERSION b/VERSION index 780824f..d84bce9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.3.5 \ No newline at end of file +7.3.6 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 5240566..cddec5f 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.4.3" -PHP_BRANCH="v2.3.4" +BASE_VERSION="6.4.4" +PHP_BRANCH="v2.3.5" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4" for V in ${PHP_VERSIONS} ; do