v7.4.0 (#232)

bfren · web-flow · commit 0e4e6273e313 · 2025-06-06T15:10:35.000+01:00
Major updates
* Using latest base images
* Switching to Alpine 3.22 and Nginx 1.28.0 for PHP 8.3 and 8.4

Minor updates
* Updating PHP 8.2 build and to PHP 8.3.22 and 8.4.8

Build updates
* Using GitHub CLI for auto PR
diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml
@@ -8,14 +8,11 @@ jobs:
     if: github.ref_type == 'branch'
     runs-on: ubuntu-latest
     steps:
-    -
-      name: Checkout Branch ${{ github.ref_name }}
-      uses: actions/checkout@v4
-    -
-      name: Create Pull Request
-      uses: bfren/pull-request@v2
-      with:
-        github_token: ${{ secrets.PAT }}
-        destination_branch: main
-        pr_title: ${{ github.ref_name }}
-        pr_body: "Merging branch to create ${{ github.ref_name }}."
+      -
+        name: Checkout Branch ${{ github.ref_name }}
+        uses: actions/checkout@v4
+      -
+        name: Create Pull Request
+        run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}."
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
diff --git 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.3.6 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.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.4.5 AS final
+FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.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
@@ -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.3.6 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.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.4.5 AS final
+FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.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
@@ -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.3.6 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.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.4.5 AS final
+FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.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
@@ -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.3.6 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.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.26-alpine3.21-6.4.5 AS final
+FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.1 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.2/NGINX_BASE b/8.2/NGINX_BASE
@@ -1 +1 @@
-nginx1.26-alpine3.21
+nginx1.28-alpine3.22
diff --git a/8.2/overlay/tmp/PHP_BUILD b/8.2/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-8.2.28-r0
+8.2.28-r1
diff --git 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.3.6 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.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.26-alpine3.21-6.4.5 AS final
+FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.1 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.3/NGINX_BASE b/8.3/NGINX_BASE
@@ -1 +1 @@
-nginx1.26-alpine3.21
+nginx1.28-alpine3.22
diff --git a/8.3/overlay/tmp/PHP_BUILD b/8.3/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-8.3.19-r0
+8.3.22-r0
diff --git a/8.3/overlay/tmp/PHP_REVISION b/8.3/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.3.19
+8.3.22
diff --git 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.3.6 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.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.26-alpine3.21-6.4.5 AS final
+FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.1 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.4/NGINX_BASE b/8.4/NGINX_BASE
@@ -1 +1 @@
-nginx1.26-alpine3.21
+nginx1.28-alpine3.22
diff --git a/8.4/overlay/tmp/PHP_BUILD b/8.4/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-8.4.5-r0
+8.4.8-r0
diff --git a/8.4/overlay/tmp/PHP_REVISION b/8.4/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.4.5
+8.4.8
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.3.7
+7.4.0
diff --git a/VERSION_MINOR b/VERSION_MINOR
@@ -1 +1 @@
-7.3
+7.4
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
@@ -4,8 +4,8 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="6.4.5"
-PHP_BRANCH="v2.3.6"
+BASE_VERSION="6.5.1"
+PHP_BRANCH="v2.4.0"
 PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4"
 
 for V in ${PHP_VERSIONS} ; do

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-nginx1.26-alpine3.21`
	`1`	`+nginx1.28-alpine3.22`