diff --git a/7.4/Dockerfile b/7.4/Dockerfile index c5492af..a22ccb7 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.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.1 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.1 AS final +FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.2 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 8074dbc..9f20b12 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.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.1 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.1 AS final +FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.2 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 89c9e39..e27257e 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.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.1 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.1 AS final +FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.2 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 28d8f15..15648b6 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.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.1 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.1 AS final +FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.2 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 acade5f..389a697 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.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.1 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.1 AS final +FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.2 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 f97a48f..8007e0d 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.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.4.1 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.1 AS final +FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.2 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 b616717..6b0e58e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.4.0 \ No newline at end of file +7.4.1 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index eb5f50e..e1cb5e4 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.5.1" -PHP_BRANCH="v2.4.0" +BASE_VERSION="6.5.2" +PHP_BRANCH="v2.4.1" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4" for V in ${PHP_VERSIONS} ; do