diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 08c749e..c16ba40 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.2 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.3 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.1 AS final +FROM quay.io/bfren/nginx:nginx1.20-alpine3.15-7.1.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 9891376..b7b540d 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.2 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.3 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.1 AS final +FROM quay.io/bfren/nginx:nginx1.22-alpine3.16-7.1.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 63fd716..a06279d 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.2 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.3 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.1 AS final +FROM quay.io/bfren/nginx:nginx1.24-alpine3.19-7.1.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 3e815b2..0a0b712 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.2 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.3 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.1 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.1.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 cfda98b..55f41e1 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.2 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.3 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.1 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.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 c5d5304..0b4d377 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.2 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.3 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.1 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.2 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.5/Dockerfile b/8.5/Dockerfile index dc1dc24..d4ef346 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.2 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.3 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.1 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.2 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.5/overlay/tmp/PHP_BUILD b/8.5/overlay/tmp/PHP_BUILD index d7a9450..454c094 100644 --- a/8.5/overlay/tmp/PHP_BUILD +++ b/8.5/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.5.1-r0 \ No newline at end of file +8.5.2-r0 \ No newline at end of file diff --git a/8.5/overlay/tmp/PHP_REVISION b/8.5/overlay/tmp/PHP_REVISION index e0741a8..bd0b85a 100644 --- a/8.5/overlay/tmp/PHP_REVISION +++ b/8.5/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.5.1 \ No newline at end of file +8.5.2 \ No newline at end of file diff --git a/LICENSE b/LICENSE index b48eea3..b07573d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2025 bfren +Copyright (c) 2020-2026 bfren Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index e896f61..345a409 100644 --- a/README.md +++ b/README.md @@ -50,4 +50,4 @@ The image contains a handful of useful Nginx configuration 'helper' files, which ## Copyright -> Copyright (c) 2020-2025 [bfren](https://bfren.dev) (unless otherwise stated) +> Copyright (c) 2020-2026 [bfren](https://bfren.dev) (unless otherwise stated) diff --git a/VERSION b/VERSION index c29b3b5..d578315 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.1.2 \ No newline at end of file +8.1.3 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index bcecbb4..1361bd0 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="7.1.1" -PHP_BRANCH="v3.1.2" +BASE_VERSION="7.1.2" +PHP_BRANCH="v3.1.3" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" for V in ${PHP_VERSIONS} ; do