Merge pull request #84 from laradock/fix-arm64

Fix docker image build

Author: bestlong

.github/workflows/dockerimage.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         # "5.6", "7.0", "7.1", "7.2", "7.3",
-        php_version: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
+        php_version: ["8.1", "8.2", "8.3", "8.4"]
     # continue-on-error: true
     steps:
       - name: Checkout
@@ -50,7 +50,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           file: Dockerfile-${{ matrix.php_version }}
-          # skip linux/arm64, linux/arm/v7,linux/arm/v6
-          platforms: linux/amd64, linux/386
+          # skip linux/arm/v7, linux/arm/v6
+          platforms: linux/amd64, linux/386, linux/arm64
           push: ${{ (github.event_name != 'pull_request') && (github.repository == 'laradock/php-fpm') && (github.ref == 'refs/heads/master') }}
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/dockerimage_arm.yml renamed to .github/workflows/dockerimage_without_arm.yml

@@ -13,8 +13,8 @@ jobs:
     strategy:
       matrix:
         # "5.6", "7.0", "7.1", "7.2", "7.3",
-        php_version: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
-    continue-on-error: true
+        php_version: ["7.4", "8.0"]
+    # continue-on-error: true
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -51,6 +51,6 @@ jobs:
         with:
           file: Dockerfile-${{ matrix.php_version }}
           # platforms: linux/amd64, linux/386, linux/arm64, linux/arm/v7, linux/arm/v6
-          platforms: linux/arm64
+          platforms: linux/amd64, linux/386
           push: ${{ (github.event_name != 'pull_request') && (github.repository == 'laradock/php-fpm') && (github.ref == 'refs/heads/master') }}
           tags: ${{ steps.meta.outputs.tags }}