v8.0.0

.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 }}."

.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 }}

.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 }}

.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

7.4/Dockerfile

@@ -2,13 +2,13 @@
 # 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 \
     # 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 ghcr.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"

8.0/Dockerfile

@@ -2,13 +2,13 @@
 # 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 \
     # 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 ghcr.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"

8.1/Dockerfile

@@ -2,13 +2,13 @@
 # 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 \
     # 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 ghcr.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"

8.2/Dockerfile

@@ -2,13 +2,13 @@
 # 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 \
     # 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 ghcr.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"

8.3/Dockerfile

@@ -2,13 +2,13 @@
 # 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 \
     # 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 ghcr.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"

8.4/Dockerfile

@@ -2,13 +2,13 @@
 # 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 \
     # 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 ghcr.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"

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"

VERSION

@@ -1 +1 @@
-7.5.3
+8.0.0

VERSION_MAJOR

@@ -1 +1 @@
-7
+8

VERSION_MINOR

@@ -1 +1 @@
-7.5
+8.0

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