Upgrade to PHP 8.4

.github/workflows/build.yml

@@ -9,6 +9,8 @@
       - LICENSE
       - .github/workflows/update-dockerhub-desc.yml
       - .github/workflows/test-pr.yml
+  #pull_request:
+  #  branches: ["dev"]
 
 env:
   IMAGE_REGISTRY: ${{ vars.REGISTRY_PUBLIC }}
@@ -29,35 +31,22 @@
         with:
           fetch-depth: 0
 
-      - name: Prepare
-        id: prepare
-        run: |
-          DOCKER_PLATFORMS=${{ vars.CONTAINER_ARCH }}
-
-          VERSION=${GITHUB_REF#refs/*/}
-          TAGS="${{ env.IMAGE_NAME }}:${VERSION}"
-
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            TAGS="$TAGS,${{ env.IMAGE_NAME }}:latest"
-          fi
-
-          for TAG in $(echo $TAGS | sed 's/,/ /g'); do
-            TAGS="$TAGS,quay.io/$TAG"
-          done
-
-          echo "platforms=${DOCKER_PLATFORMS}" >> $GITHUB_OUTPUT
-          echo "tags=${TAGS}" >> $GITHUB_OUTPUT
+      - name: Prepare Meta Data
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.IMAGE_NAME }}
+            quay.io/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=tag
+            type=ref,event=branch
 
       - name: Set up QEMU
-        id: qemu
         uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:latest
-          platforms: all
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        id: buildx
 
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -89,12 +78,13 @@
         env:
           TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
 
-      - name: Upload Trivy scan results to GitHub Security tab
+      - name: Upload Trivy scan results
+        if: github.event_name != 'pull_request'
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: 'trivy-results.sarif'
 
-      - name: Run the Anchore scan action
+      - name: Run Anchore scan
         uses: anchore/scan-action@v6
         id: anchore-scan
         with:
@@ -103,6 +93,7 @@
           fail-build: false
 
       - name: Upload Anchore Scan Report
+        if: github.event_name != 'pull_request'
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: ${{ steps.anchore-scan.outputs.sarif }}
@@ -134,6 +125,8 @@
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.prepare.outputs.tags }}
-          platforms: ${{ steps.prepare.outputs.platforms }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          annotations: ${{ steps.meta.outputs.annotations }}
+          platforms: ${{ vars.CONTAINER_ARCH }}
           provenance: false

Dockerfile

@@ -18,16 +18,16 @@ LABEL org.opencontainers.image.title="alpine-php-nginx" \
       org.opencontainers.image.source="https://github.com/jimsihk/alpine-php-nginx" \
       org.opencontainers.image.documentation="https://github.com/jimsihk/alpine-php-nginx"
 
-ARG PHP_V=83
+ARG PHP_V=84
 ENV PHP_RUNTIME=php${PHP_V}
 ENV PHP_FPM_RUNTIME=php-fpm${PHP_V}
-# renovate: datasource=repology depName=alpine_3_21/php83 versioning=loose
-ENV PHP_VERSION="=8.3.19-r0"
-# renovate: datasource=repology depName=alpine_3_21/php83-pecl-apcu versioning=loose
-ARG PHP_PECL_APCU_VERSION="=5.1.24-r0"
-# renovate: datasource=repology depName=alpine_3_21/php83-pecl-memcached versioning=loose
+# renovate: datasource=repology depName=alpine_3_21/php84 versioning=loose
+ENV PHP_VERSION="=8.4.5-r0"
+# renovate: datasource=repology depName=alpine_3_21/php84-pecl-apcu versioning=loose
+ARG PHP_PECL_APCU_VERSION="=5.1.24-r1"
+# renovate: datasource=repology depName=alpine_3_21/php84-pecl-memcached versioning=loose
 ARG PHP_PECL_MEMCACHED_VERSION="=3.3.0-r0"
-# renovate: datasource=repology depName=alpine_3_21/php83-pecl-redis versioning=loose
+# renovate: datasource=repology depName=alpine_3_21/php84-pecl-redis versioning=loose
 ARG PHP_PECL_REDIS_VERSION="=6.2.0-r0"
 # renovate: datasource=repology depName=alpine_3_21/nginx versioning=loose
 ARG NGINX_VERSION="=1.26.3-r0"

run_tests.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-curl --silent --fail http://app:8080 | grep '8.3'
+curl --silent --fail http://app:8080 | grep '8.4'