diff --git a/7.4/Dockerfile b/7.4/Dockerfile index c16ba40..f5938d3 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.4 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.2 AS final +FROM quay.io/bfren/nginx:nginx1.20-alpine3.15-7.1.3 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 b7b540d..7383704 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.4 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.2 AS final +FROM quay.io/bfren/nginx:nginx1.22-alpine3.16-7.1.3 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 a06279d..a2595db 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.4 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.2 AS final +FROM quay.io/bfren/nginx:nginx1.24-alpine3.19-7.1.3 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 0a0b712..061ea6c 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.4 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.2 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.1.3 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 55f41e1..8355f56 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.4 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.2 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.3 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 de06524..b9c309b 100644 --- a/8.3/overlay/tmp/PHP_BUILD +++ b/8.3/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.3.29-r0 \ No newline at end of file +8.3.30-r0 \ No newline at end of file diff --git a/8.3/overlay/tmp/PHP_REVISION b/8.3/overlay/tmp/PHP_REVISION index 4bb9e36..0f197cf 100644 --- a/8.3/overlay/tmp/PHP_REVISION +++ b/8.3/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.3.29 \ No newline at end of file +8.3.30 \ No newline at end of file diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 0b4d377..6f42795 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.4 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.2 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.3 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 d04861e..0843217 100644 --- a/8.4/overlay/tmp/PHP_BUILD +++ b/8.4/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.4.16-r0 \ No newline at end of file +8.4.17-r0 \ No newline at end of file diff --git a/8.4/overlay/tmp/PHP_REVISION b/8.4/overlay/tmp/PHP_REVISION index 79c1c50..d7b295f 100644 --- a/8.4/overlay/tmp/PHP_REVISION +++ b/8.4/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.4.16 \ No newline at end of file +8.4.17 \ No newline at end of file diff --git a/8.5/Dockerfile b/8.5/Dockerfile index d4ef346..8fd373c 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.3 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.4 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.2 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.3 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 d578315..001bf16 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.1.3 \ No newline at end of file +8.1.4 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 1361bd0..553b2fd 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="7.1.2" -PHP_BRANCH="v3.1.3" +BASE_VERSION="7.1.3" +PHP_BRANCH="v3.1.4" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" for V in ${PHP_VERSIONS} ; do