From 9ef1823a7b96f0b89d0687b0ea41521c1edee64b Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Mon, 11 Jan 2021 13:03:33 +0100 Subject: [PATCH] Publish as single multi-arch Docker image This commit bundles the `helm-controller:$VER-arm64` ARM image tag range that was previously released separately with the `helm-controller:$VER` image, as GitHub now provides us insights into image layer statistics. Signed-off-by: Hidde Beydals --- .github/workflows/release.yml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f5b3f37a4..b05477eaf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,14 +40,14 @@ jobs: with: username: fluxcdbot password: ${{ secrets.DOCKER_FLUXCD_PASSWORD }} - - name: Publish AMD64 image + - name: Publish multi-arch container image uses: docker/build-push-action@v2 with: push: true builder: ${{ steps.buildx.outputs.name }} context: . file: ./Dockerfile - platforms: linux/amd64 + platforms: linux/amd64,linux/arm/v7,linux/arm64 tags: | ghcr.io/fluxcd/helm-controller:${{ steps.prep.outputs.VERSION }} docker.io/fluxcd/helm-controller:${{ steps.prep.outputs.VERSION }} @@ -58,28 +58,10 @@ jobs: org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.version=${{ steps.prep.outputs.VERSION }} org.opencontainers.image.created=${{ steps.prep.outputs.BUILD_DATE }} - - name: Publish ARM image - uses: docker/build-push-action@v2 - with: - push: true - builder: ${{ steps.buildx.outputs.name }} - context: . - file: ./Dockerfile - platforms: linux/arm/v7,linux/arm64 - tags: | - ghcr.io/fluxcd/helm-controller-arm64:${{ steps.prep.outputs.VERSION }} - labels: | - org.opencontainers.image.title=${{ github.event.repository.name }} - org.opencontainers.image.description=${{ github.event.repository.description }} - org.opencontainers.image.url=${{ github.event.repository.html_url }} - org.opencontainers.image.revision=${{ github.sha }} - org.opencontainers.image.version=${{ steps.prep.outputs.VERSION }} - org.opencontainers.image.created=${{ steps.prep.outputs.BUILD_DATE }} - name: Check images run: | docker buildx imagetools inspect docker.io/fluxcd/helm-controller:${{ steps.prep.outputs.VERSION }} docker buildx imagetools inspect ghcr.io/fluxcd/helm-controller:${{ steps.prep.outputs.VERSION }} - docker buildx imagetools inspect ghcr.io/fluxcd/helm-controller-arm64:${{ steps.prep.outputs.VERSION }} docker pull docker.io/fluxcd/helm-controller:${{ steps.prep.outputs.VERSION }} docker pull ghcr.io/fluxcd/helm-controller:${{ steps.prep.outputs.VERSION }} - name: Generate release asset