From a0907c475d2dba938dd68b1b3370b012f8682da9 Mon Sep 17 00:00:00 2001 From: Leonard Jonathan Oh Date: Wed, 15 Sep 2021 16:45:14 +0000 Subject: [PATCH] Refactor (definitions): Explicitly specify linux/arm arch as linux/arm/v7 for clarity --- .github/workflows/ci-master-pr.yml | 6 +++--- generate/definitions/VARIANTS.ps1 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml index cab4664..641c97a 100644 --- 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 index 2d36b41..ec908e9 100644 --- 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" }