From 057db564fd1e5bb5cec45b04fc45d716cc16ec97 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Thu, 11 May 2023 17:08:02 +0100 Subject: [PATCH] actions: multi-arch runtime-payload - Create multi-arch manifests for the ci and release runtime-payload that are tagged with the commit, for use in the operator Fixes: #6814 Signed-off-by: stevenhorsman --- .github/workflows/cc-payload-after-push.yaml | 9 ++++++++- .github/workflows/cc-payload.yaml | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cc-payload-after-push.yaml b/.github/workflows/cc-payload-after-push.yaml index fb047272b0..cc995d44ee 100644 --- a/.github/workflows/cc-payload-after-push.yaml +++ b/.github/workflows/cc-payload-after-push.yaml @@ -31,7 +31,14 @@ jobs: username: ${{ secrets.COCO_QUAY_DEPLOYER_USERNAME }} password: ${{ secrets.COCO_QUAY_DEPLOYER_PASSWORD }} - - name: Push multi-arch manifest + - name: Push commit multi-arch manifest + run: | + docker manifest create quay.io/confidential-containers/runtime-payload-ci:kata-containers-${GITHUB_SHA} \ + --amend quay.io/confidential-containers/runtime-payload-ci:kata-containers-${GITHUB_SHA}-amd64 \ + --amend quay.io/confidential-containers/runtime-payload-ci:kata-containers-${GITHUB_SHA}-s390x + docker manifest push quay.io/confidential-containers/runtime-payload-ci:kata-containers-${GITHUB_SHA} + + - name: Push latest multi-arch manifest run: | docker manifest create quay.io/confidential-containers/runtime-payload-ci:kata-containers-latest \ --amend quay.io/confidential-containers/runtime-payload-ci:kata-containers-amd64 \ diff --git a/.github/workflows/cc-payload.yaml b/.github/workflows/cc-payload.yaml index f079369070..81912ef82f 100644 --- a/.github/workflows/cc-payload.yaml +++ b/.github/workflows/cc-payload.yaml @@ -31,7 +31,14 @@ jobs: username: ${{ secrets.COCO_QUAY_DEPLOYER_USERNAME }} password: ${{ secrets.COCO_QUAY_DEPLOYER_PASSWORD }} - - name: Push multi-arch manifest + - name: Push commit multi-arch manifest + run: | + docker manifest create quay.io/confidential-containers/runtime-payload:kata-containers-${GITHUB_SHA} \ + --amend quay.io/confidential-containers/runtime-payload:kata-containers-${GITHUB_SHA}-amd64 \ + --amend quay.io/confidential-containers/runtime-payload:kata-containers-${GITHUB_SHA}-s390x + docker manifest push quay.io/confidential-containers/runtime-payload:kata-containers-${GITHUB_SHA} + + - name: Push latest multi-arch manifest run: | docker manifest create quay.io/confidential-containers/runtime-payload:kata-containers-latest \ --amend quay.io/confidential-containers/runtime-payload:kata-containers-amd64 \