Build both platforms in one action

rmcrackan · Oct 22, 2024 · e0403e4 · e0403e4
1 parent 011efe3
commit e0403e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -23,15 +23,7 @@ on:
 jobs:
   build_and_push:
     runs-on: ubuntu-latest
-    strategy:
-      # Prevent a failure in one image from stopping the other builds
-      fail-fast: false
-      matrix:
-        os: 
-          - ubuntu-latest
-        arch:
-          - amd64
-          - arm64
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -62,11 +54,9 @@ jobs:
       - name: Build and push image
         uses: docker/build-push-action@v6
         with:
-          platforms: ${{ matrix.arch }}
+          platforms: linux/amd64,linux/arm64
           push: ${{ steps.metadata.outputs.tags != ''}}
           cache-from: type=gha
           cache-to: type=gha,mode=max
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
-          build-args: |
-            TARGETARCH=${{ matrix.arch }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
 # Dockerfile
 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
-ARG TARGETARCH=amd64
+
+RUN echo "ARCH: $TARGETARCH"
 
 COPY Source /Source
 RUN dotnet publish \