From 97d63e4637cff6c319d77469378773bb4f931ab0 Mon Sep 17 00:00:00 2001 From: Lukas Prettenthaler Date: Sun, 12 Jun 2022 21:50:15 +0200 Subject: [PATCH] fix manifest creation --- .github/workflows/bridge.yml | 12 ++++++------ .github/workflows/multiarch.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/bridge.yml b/.github/workflows/bridge.yml index 00cabfb..b1ee3f5 100644 --- a/.github/workflows/bridge.yml +++ b/.github/workflows/bridge.yml @@ -106,12 +106,12 @@ jobs: - name: Create multi-arch manifest run: | buildah manifest create ${{ env.IMAGE_NAME }}:latest - buildah manifest add --arch amd64 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:amd64 - buildah manifest add --arch 386 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:i386 - buildah manifest add --arch arm64 --variant v8 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm64v8 - buildah manifest add --arch arm --variant v7 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm32v7 - buildah manifest add --arch arm --variant v6 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm32v6 - buildah manifest add --arch riscv64 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:riscv64 + buildah manifest add ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:amd64 + buildah manifest add ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:i386 + buildah manifest add ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm64v8 + buildah manifest add ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm32v7 + buildah manifest add ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm32v6 + buildah manifest add ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:riscv64 - name: Push unstable images if: ${{ inputs.event == 'push' }} diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml index 377c349..a96c02e 100644 --- a/.github/workflows/multiarch.yml +++ b/.github/workflows/multiarch.yml @@ -87,12 +87,12 @@ jobs: - name: Create multi-arch manifest run: | buildah manifest create ${{ env.IMAGE_NAME }}:latest - buildah manifest add --arch amd64 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:amd64 - buildah manifest add --arch 386 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:i386 - buildah manifest add --arch arm64 --variant v8 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm64v8 - buildah manifest add --arch arm --variant v7 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm32v7 - buildah manifest add --arch arm --variant v6 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm32v6 - buildah manifest add --arch riscv64 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:riscv64 + buildah manifest add ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:amd64 + buildah manifest add ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:i386 + buildah manifest add ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm64v8 + buildah manifest add ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm32v7 + buildah manifest add ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm32v6 + buildah manifest add ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:riscv64 - name: Push unstable images if: ${{ github.event_name == 'push' }}