Bump tools + arm64 platform

nbgrp · Apr 18, 2024 · c9ab5ad · c9ab5ad
1 parent 1de157e
commit c9ab5ad
Show file tree

Hide file tree

Showing 14 changed files with 618 additions and 757 deletions.
diff --git a/.github/workflows/push-to-docker-hub.yml b/.github/workflows/push-to-docker-hub.yml
@@ -14,6 +14,12 @@ jobs:
         id: get-version
         run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -dv -f2)" >> $GITHUB_OUTPUT
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -23,8 +29,10 @@ jobs:
       - name: Push to Docker Hub
         uses: docker/build-push-action@v5
         with:
+          context: .
           build-args: |
             AUDITOR_VERSION=${{ steps.get-version.outputs.VERSION }}
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             nbgrp/auditor:${{ steps.get-version.outputs.VERSION }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-ARG PHP_VERSION=8.3.1
+ARG PHP_VERSION=8.3.6
 
 
-FROM php:${PHP_VERSION}-cli-alpine
+FROM --platform=$BUILDPLATFORM php:${PHP_VERSION}-cli-alpine
 
 ARG AUDITOR_VERSION
 

diff --git a/tools/phan/composer.lock b/tools/phan/composer.lock
diff --git a/tools/php-cs-fixer/composer.json b/tools/php-cs-fixer/composer.json
@@ -9,7 +9,7 @@
         "symfony/polyfill-php81": "*"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^v3.46.0"
+        "friendsofphp/php-cs-fixer": "^v3.54.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true