Merge pull request #8 from theohbrothers/refactor/definitions-explici…

…tly-specify-linux-arm-arch-as-linux-arm-v7-for-clarity Refactor (definitions): Explicitly specify linux/arm arch as linux/arm/v7 for clarity
theohbrothers · Sep 15, 2021 · c8e0fa0 · c8e0fa0
2 parents e5ac62d + a0907c4
commit c8e0fa0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
@@ -94,7 +94,7 @@ jobs:
       uses: docker/build-push-action@v2
       with:
         context: ${{ steps.prep.outputs.CONTEXT }}
-        platforms: linux/386,linux/amd64,linux/arm,linux/arm64,linux/s390x
+        platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
           ${{ github.repository }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF }}
@@ -109,7 +109,7 @@ jobs:
       uses: docker/build-push-action@v2
       with:
         context: ${{ steps.prep.outputs.CONTEXT }}
-        platforms: linux/386,linux/amd64,linux/arm,linux/arm64,linux/s390x
+        platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
           ${{ github.repository }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF }}
@@ -124,7 +124,7 @@ jobs:
       uses: docker/build-push-action@v2
       with:
         context: ${{ steps.prep.outputs.CONTEXT }}
-        platforms: linux/386,linux/amd64,linux/arm,linux/arm64,linux/s390x
+        platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
           ${{ github.repository }}:${{ steps.prep.outputs.VARIANT_TAG }}

diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
@@ -5,7 +5,7 @@ $VARIANTS = @(
             components = @( 'varnishdashboard' )
             distro = 'ubuntu'
             distro_version = '16.04'
-            platforms = 'linux/386,linux/amd64,linux/arm,linux/arm64,linux/s390x'
+            platforms = 'linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/s390x'
             VARNISH_AGENT_VERSION = '4.1.4'
             VARNISH_DASHBOARD_COMMIT = "e2cc1c854941c9fac18bdfedba2819fa766a5549"
         }