See if combining back into single build will work

FalconChristmas · Jan 31, 2025 · 3b7ab03 · 3b7ab03
1 parent c127abf
commit 3b7ab03
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -18,9 +18,7 @@ jobs:
     name: Build Docker image and push to repositories
     # run only when code is compiling and tests are passing
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        architecture: [amd64, arm64, arm/v7]
+
     # steps to perform in job
     steps:
       - name: Checkout code
@@ -68,11 +66,11 @@ jobs:
           file: ./Docker/Dockerfile
           build-args: "FPPBRANCH=${{ steps.extract_branch.outputs.branch }}"
           # Note: tags has to be all lower-case
-          platforms: linux/${{ matrix.architecture }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           tags: ${{ env.IMAGE_REPOSITORY }}/fpp:${{ steps.extract_branch.outputs.branch }},${{ env.IMAGE_REPOSITORY }}/fpp:latest
           push: true
-          cache-from: type=gha,scope=fpp-build-${{ matrix.architecture }}
-          cache-to: type=gha,scope=fpp-build-${{ matrix.architecture }},mode=max
+          cache-from: type=gha,scope=fpp-build-docker
+          cache-to: type=gha,scope=fpp-build-docker,mode=max
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}