Merge branch 'main' into release/webserver-improvements-and-fixes

Author: jaydrogers

.github/workflows/service_docker-build-and-publish.yml

@@ -93,6 +93,9 @@ jobs:
       - name: Move PHP Versions file
         run: mv ./artifacts/php-versions.yml ${{ inputs.php-versions-file }}
 
+      - name: Set up Depot CLI
+        uses: depot/setup-action@v1
+      
       ##
       # Docker build & publish
       ##
@@ -111,12 +114,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: "📦 Assemble the Docker Tags"
         run: |
           chmod +x ./scripts/assemble-docker-tags.sh
@@ -167,11 +164,11 @@ jobs:
           echo "nginx_arg=NGINX_VERSION=$VERSION" >> $GITHUB_OUTPUT
 
       - name: Build images
-        uses: docker/build-push-action@v6
+        uses: depot/build-push-action@v1
         with:
+          project: ${{ secrets.DEPOT_PROJECT_ID }}
+          token: ${{ secrets.DEPOT_PROJECT_TOKEN }}
           file: src/variations/${{ matrix.php_variation }}/Dockerfile
-          cache-from: type=gha
-          cache-to: type=gha
           build-args: |
             BASE_OS_VERSION=${{ matrix.base_os }}
             PHP_VERSION=${{ matrix.patch_version }}

scripts/conf/php-versions-base-config.yml

@@ -95,31 +95,31 @@ operating_systems:
       - name: "Alpine 3.20"
         version: alpine3.20
         number: 3.20
-        nginx_version: 1.28.1-r1
+        nginx_version: 1.28.2-r1
       - name: "Alpine 3.21"
         version: alpine3.21
         number: 3.21
-        nginx_version: 1.28.1-r1
+        nginx_version: 1.28.2-r1
       - name: "Alpine 3.22"
         version: alpine3.22
         number: 3.22
-        nginx_version: 1.28.1-r1
+        nginx_version: 1.28.2-r1
       - name: "Alpine 3.23"
         version: alpine3.23
         number: 3.23
-        nginx_version: 1.28.1-r1
+        nginx_version: 1.28.2-r1
   - family: debian
     default: true
     versions:
       - name: "Debian Bullseye"
         version: bullseye
         number: 11
-        nginx_version: 1.28.1-1~bullseye
+        nginx_version: 1.28.2-1~bullseye
       - name: "Debian Bookworm"
         version: bookworm
         number: 12
-        nginx_version: 1.28.1-1~bookworm
+        nginx_version: 1.28.2-1~bookworm
       - name: "Debian Trixie"
         version: trixie
         number: 13
-        nginx_version: 1.28.1-1~trixie
+        nginx_version: 1.28.2-1~trixie