From 300f01b63a1fbbe41a66cc9c6f666eea4ca95b22 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Nov 2025 14:16:30 +0000
Subject: [PATCH 1/5] Bumping version to 7.5.4

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 02533ec..a0e1e88 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.5.3
\ No newline at end of file
+7.5.4
\ No newline at end of file

From 21c8f9c6d3441c0d5535c6461a50b50f3ffc4331 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Nov 2025 14:17:20 +0000
Subject: [PATCH 2/5] Bumping version to 8.0.0

---
 VERSION       | 2 +-
 VERSION_MAJOR | 2 +-
 VERSION_MINOR | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index a0e1e88..fa5fce0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.5.4
\ No newline at end of file
+8.0.0
\ No newline at end of file
diff --git a/VERSION_MAJOR b/VERSION_MAJOR
index c793025..301160a 100644
--- a/VERSION_MAJOR
+++ b/VERSION_MAJOR
@@ -1 +1 @@
-7
\ No newline at end of file
+8
\ No newline at end of file
diff --git a/VERSION_MINOR b/VERSION_MINOR
index 7290605..b293f64 100644
--- a/VERSION_MINOR
+++ b/VERSION_MINOR
@@ -1 +1 @@
-7.5
\ No newline at end of file
+8.0
\ No newline at end of file

From 024abe3c15cabaca5d9efcfd7fe8c1b680d6015e Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Nov 2025 14:17:32 +0000
Subject: [PATCH 3/5] Switching to use quay.io

---
 7.4/Dockerfile | 4 ++--
 8.0/Dockerfile | 4 ++--
 8.1/Dockerfile | 4 ++--
 8.2/Dockerfile | 4 ++--
 8.3/Dockerfile | 4 ++--
 8.4/Dockerfile | 4 ++--
 Dockerfile.esh | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/7.4/Dockerfile b/7.4/Dockerfile
index 49673d2..4482287 100644
--- a/7.4/Dockerfile
+++ b/7.4/Dockerfile
@@ -2,7 +2,7 @@
 # STAGE 0: get Nu scripts from the PHP image overlay
 #======================================================================================================================
 
-FROM ghcr.io/bfren/alpine AS php
+FROM quay.io/bfren/alpine AS php
 
 WORKDIR /tmp
 RUN \
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.7 AS final
+FROM quay.io/bfren/nginx:nginx1.20-alpine3.15-6.5.7 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 98c1255..439b18f 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -2,7 +2,7 @@
 # STAGE 0: get Nu scripts from the PHP image overlay
 #======================================================================================================================
 
-FROM ghcr.io/bfren/alpine AS php
+FROM quay.io/bfren/alpine AS php
 
 WORKDIR /tmp
 RUN \
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.7 AS final
+FROM quay.io/bfren/nginx:nginx1.22-alpine3.16-6.5.7 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 6b44702..9adc0b8 100644
--- a/8.1/Dockerfile
+++ b/8.1/Dockerfile
@@ -2,7 +2,7 @@
 # STAGE 0: get Nu scripts from the PHP image overlay
 #======================================================================================================================
 
-FROM ghcr.io/bfren/alpine AS php
+FROM quay.io/bfren/alpine AS php
 
 WORKDIR /tmp
 RUN \
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.7 AS final
+FROM quay.io/bfren/nginx:nginx1.24-alpine3.19-6.5.7 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 a464f80..1966e38 100644
--- a/8.2/Dockerfile
+++ b/8.2/Dockerfile
@@ -2,7 +2,7 @@
 # STAGE 0: get Nu scripts from the PHP image overlay
 #======================================================================================================================
 
-FROM ghcr.io/bfren/alpine AS php
+FROM quay.io/bfren/alpine AS php
 
 WORKDIR /tmp
 RUN \
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final
+FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 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 fdd1192..a09e0b7 100644
--- a/8.3/Dockerfile
+++ b/8.3/Dockerfile
@@ -2,7 +2,7 @@
 # STAGE 0: get Nu scripts from the PHP image overlay
 #======================================================================================================================
 
-FROM ghcr.io/bfren/alpine AS php
+FROM quay.io/bfren/alpine AS php
 
 WORKDIR /tmp
 RUN \
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final
+FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 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 4f1428b..6da67ef 100644
--- a/8.4/Dockerfile
+++ b/8.4/Dockerfile
@@ -2,7 +2,7 @@
 # STAGE 0: get Nu scripts from the PHP image overlay
 #======================================================================================================================
 
-FROM ghcr.io/bfren/alpine AS php
+FROM quay.io/bfren/alpine AS php
 
 WORKDIR /tmp
 RUN \
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final
+FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/Dockerfile.esh b/Dockerfile.esh
index 59bea4b..079ac54 100644
--- a/Dockerfile.esh
+++ b/Dockerfile.esh
@@ -2,7 +2,7 @@
 # STAGE 0: get Nu scripts from the PHP image overlay
 #======================================================================================================================
 
-FROM ghcr.io/bfren/alpine AS php
+FROM quay.io/bfren/alpine AS php
 
 WORKDIR /tmp
 RUN \
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:<%= ${NGINX_BASE} %>-<%= ${BASE_VERSION} %> AS final
+FROM quay.io/bfren/nginx:<%= ${NGINX_BASE} %>-<%= ${BASE_VERSION} %> AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"

From b5f2b4f09f7de5b3b87bab62dd10fc4f5fe84a37 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Nov 2025 14:17:39 +0000
Subject: [PATCH 4/5] Updating workflow action versions

---
 .github/workflows/auto-pr.yml       |  2 +-
 .github/workflows/dev.yml           | 12 ++++++------
 .github/workflows/publish.yml       | 20 ++++++++++----------
 .github/workflows/update-readme.yml |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml
index 54c3776..0d434ac 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@v4
+        uses: actions/checkout@v6
       -
         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 fa9cc55..06643d2 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       -
         name: Get repository name
         run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -43,12 +43,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Login to GitHub Container Registry
+        name: Login to Quay.io Container Registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
+          registry: quay.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.QUAY_TOKEN }}
       -
         name: Build and export
         id: docker_export
@@ -80,8 +80,8 @@ jobs:
           tags: |
             bfren/nginx-php:php${{ matrix.php }}-dev
             bfren/nginx-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
-            ghcr.io/bfren/nginx-php:php${{ matrix.php }}-dev
-            ghcr.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
+            quay.io/bfren/nginx-php:php${{ matrix.php }}-dev
+            quay.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 291b9bf..f47064c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       -
         name: Get repository name
         run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -57,12 +57,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Login to GitHub Container Registry
+        name: Login to Quay.io Container Registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
+          registry: quay.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.QUAY_TOKEN }}
       -
         name: Build and push
         id: docker_build
@@ -83,12 +83,12 @@ jobs:
             bfren/nginx-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}
             bfren/nginx-php:php${{ steps.php_revision.outputs.contents }}
             bfren/nginx-php:php${{ steps.php_revision.outputs.contents }}-${{ steps.version.outputs.contents }}
-            ghcr.io/bfren/nginx-php:php${{ matrix.php }}
-            ghcr.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version_major.outputs.contents }}
-            ghcr.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version_minor.outputs.contents }}
-            ghcr.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}
-            ghcr.io/bfren/nginx-php:php${{ steps.php_revision.outputs.contents }}
-            ghcr.io/bfren/nginx-php:php${{ steps.php_revision.outputs.contents }}-${{ steps.version.outputs.contents }}
+            quay.io/bfren/nginx-php:php${{ matrix.php }}
+            quay.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version_major.outputs.contents }}
+            quay.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version_minor.outputs.contents }}
+            quay.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}
+            quay.io/bfren/nginx-php:php${{ steps.php_revision.outputs.contents }}
+            quay.io/bfren/nginx-php:php${{ steps.php_revision.outputs.contents }}-${{ steps.version.outputs.contents }}
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 7fc7506..4e5b4a9 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -15,7 +15,7 @@ jobs:
         shell: bash
       -
         name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       -
         name: Login to DockerHub
         uses: docker/login-action@v3

From f955fbbeb1845e2aa36c1f0abce30ee50e398e0e Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Nov 2025 14:17:51 +0000
Subject: [PATCH 5/5] 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 ++--
 generate-dockerfiles.sh | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/7.4/Dockerfile b/7.4/Dockerfile
index 4482287..1e8865c 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.7 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v3.0.0 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-6.5.7 AS final
+FROM quay.io/bfren/nginx:nginx1.20-alpine3.15-7.0.0 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 439b18f..4ae9127 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.7 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v3.0.0 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-6.5.7 AS final
+FROM quay.io/bfren/nginx:nginx1.22-alpine3.16-7.0.0 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 9adc0b8..591d99d 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.7 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v3.0.0 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-6.5.7 AS final
+FROM quay.io/bfren/nginx:nginx1.24-alpine3.19-7.0.0 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 1966e38..bcd48fd 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.7 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v3.0.0 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-6.5.7 AS final
+FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.0 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 a09e0b7..38d895e 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.7 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v3.0.0 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-6.5.7 AS final
+FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.0 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 6da67ef..238d6d7 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.7 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v3.0.0 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-6.5.7 AS final
+FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.0 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 83a2474..1de1da8 100755
--- a/generate-dockerfiles.sh
+++ b/generate-dockerfiles.sh
@@ -4,8 +4,8 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="6.5.7"
-PHP_BRANCH="v2.4.7"
+BASE_VERSION="7.0.0"
+PHP_BRANCH="v3.0.0"
 PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4"
 
 for V in ${PHP_VERSIONS} ; do