From 6d04144187d0b038a84b47989cee9bbd873d9ecb Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 17 Jul 2026 06:12:10 +0100 Subject: [PATCH 1/4] Bumping version to 8.2.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 797ed2e2..6c961643 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.2.1 \ No newline at end of file +8.2.2 \ No newline at end of file From 665a8fbaa673544238ffb7a1f461486d4a3af565 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 17 Jul 2026 06:13:20 +0100 Subject: [PATCH 2/4] Using latest base images --- 7.4/Dockerfile | 4 ++-- 8.0/Dockerfile | 4 ++-- 8.1/Dockerfile | 4 ++-- 8.2/Dockerfile | 4 ++-- 8.3/Dockerfile | 4 ++-- 8.4/Dockerfile | 4 ++-- 8.5/Dockerfile | 4 ++-- generate-dockerfiles.sh | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 0869d835..a44d35d9 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.14 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.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.20-alpine3.15-7.2.1 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 583e456c..fe7a2625 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.14 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.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.22-alpine3.16-7.2.1 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 462db3d0..a34a78db 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.14 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.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.24-alpine3.19-7.2.1 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 f8c6342a..22093a50 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.14 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.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.2.1 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 b2ea199e..df8adccf 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.14 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.30-alpine3.24-7.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.30-alpine3.24-7.2.1 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 b3bae79e..eb5683e3 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.14 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.30-alpine3.24-7.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.30-alpine3.24-7.2.1 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 4fe4aff4..ce7ab7d0 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.14 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.30-alpine3.24-7.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.30-alpine3.24-7.2.1 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index a4906fff..7f1fa397 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="7.2.0" -PHP_BRANCH="v3.1.13" +BASE_VERSION="7.2.1" +PHP_BRANCH="v3.1.14" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" for V in ${PHP_VERSIONS} ; do From d24b563c29bdc920ea67f2ba9b3db5c5a42f7a81 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 17 Jul 2026 06:20:56 +0100 Subject: [PATCH 3/4] Updating GitHub workflows --- .github/workflows/auto-pr.yml | 2 +- .github/workflows/dev.yml | 14 +++++++------- .github/workflows/publish.yml | 12 ++++++------ .github/workflows/update-readme.yml | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 0d434ac1..61886a14 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout Branch ${{ github.ref_name }} - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Create Pull Request run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}." diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index c541219f..664b6e48 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -32,19 +32,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: quay.io username: ${{ github.repository_owner }} @@ -52,7 +52,7 @@ jobs: - name: Build and export id: docker_export - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: file: ./${{ matrix.php }}/Dockerfile build-args: | @@ -68,7 +68,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./${{ matrix.php }}/Dockerfile diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8049beda..27c2f3b5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -46,19 +46,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: quay.io username: ${{ github.repository_owner }} @@ -66,7 +66,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./${{ matrix.php }}/Dockerfile diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 71530063..31e6472f 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -15,10 +15,10 @@ jobs: shell: bash - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From 98ca0dbf30a6a48066b8940922e8246f4fbde4d9 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 17 Jul 2026 06:21:59 +0100 Subject: [PATCH 4/4] Using latest base images --- 7.4/Dockerfile | 2 +- 8.0/Dockerfile | 2 +- 8.1/Dockerfile | 2 +- 8.2/Dockerfile | 2 +- 8.3/Dockerfile | 2 +- 8.4/Dockerfile | 2 +- 8.5/Dockerfile | 2 +- generate-dockerfiles.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index a44d35d9..c9990873 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.14 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index fe7a2625..648517cd 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.14 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/8.1/Dockerfile b/8.1/Dockerfile index a34a78db..2262328d 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.14 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 22093a50..c8ce0d28 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.14 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index df8adccf..1f0627a6 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.14 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/8.4/Dockerfile b/8.4/Dockerfile index eb5683e3..2d1ab925 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.14 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/8.5/Dockerfile b/8.5/Dockerfile index ce7ab7d0..18080cc2 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.14 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 7f1fa397..d4e59a3b 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -5,7 +5,7 @@ set -euo pipefail docker pull bfren/alpine BASE_VERSION="7.2.1" -PHP_BRANCH="v3.1.14" +PHP_BRANCH="v3.1.15" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" for V in ${PHP_VERSIONS} ; do