Use imagetools for generating container manifest

Signed-off-by: Jakub Stejskal <xstejs24@gmail.com>

Author: Frawless

.azure/scripts/install_syft.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-readonly VERSION="0.90.0"
+readonly VERSION="1.20.0"
 
 ARCH=$1
 if [ -z "$ARCH" ]; then

.azure/templates/jobs/push_container.yaml

@@ -30,32 +30,25 @@ jobs:
           DOCKER_USER: $(QUAY_USER)
           DOCKER_PASS: $(QUAY_PASS)
           DOCKER_REGISTRY: "quay.io"
-      - bash: "make docker_delete_manifest"
-        displayName: "Delete existing container manifest"
-        env:
-          BUILD_REASON: $(Build.Reason)
-          BRANCH: $(Build.SourceBranch)
-          DOCKER_REGISTRY: "quay.io"
-          DOCKER_ORG: "strimzi"
-          DOCKER_TAG: '${{ parameters.dockerTag }}'
       - ${{ each arch in parameters.architectures }}:
-          - bash: make docker_load docker_tag docker_push docker_amend_manifest docker_delete_archive
-            displayName: "Push the ${{ arch }} containers and create manifest"
+          - bash: make docker_load docker_tag docker_push docker_delete_archive
+            displayName: "Push the ${{ arch }} containers"
             env:
               BUILD_REASON: $(Build.Reason)
               BRANCH: $(Build.SourceBranch)
               DOCKER_REGISTRY: "quay.io"
               DOCKER_ORG: "strimzi"
               DOCKER_TAG: '${{ parameters.dockerTag }}'
               DOCKER_ARCHITECTURE: ${{ arch }}
-      - bash: "make docker_push_manifest"
-        displayName: "Push container manifest"
+      - bash: "make docker_amend_manifest"
+        displayName: "Create multi-platform manifests"
         env:
           BUILD_REASON: $(Build.Reason)
           BRANCH: $(Build.SourceBranch)
           DOCKER_REGISTRY: "quay.io"
           DOCKER_ORG: "strimzi"
           DOCKER_TAG: '${{ parameters.dockerTag }}'
+          MANIFEST_ARCHITECTURES: '${{ join('','', parameters.architectures) }}'
       - bash: "make docker_sign_manifest"
         displayName: "Sign container manifest"
         env:

.github/actions/build/push-containers/action.yml

@@ -67,32 +67,26 @@ runs:
       shell: bash
       run: docker login -u ${{ inputs.quayUser }} -p ${{ inputs.quayPass }} ${{ env.DOCKER_REGISTRY }}
 
-    - name: Delete existing container manifests
-      shell: bash
-      run: make docker_delete_manifest
-      env:
-        BUILD_REASON: "IndividualCI"
-        BRANCH: ${{ github.ref }}
-
-    - name: Push containers and create manifests
+    - name: Push containers
       shell: bash
       run: |
         IFS=',' read -ra ARCH_ARRAY <<< "${{ inputs.architectures }}"
         for arch in "${ARCH_ARRAY[@]}"; do
           echo "Processing architecture: ${arch}"
           export DOCKER_ARCHITECTURE="${arch}"
-          make docker_load docker_tag docker_push docker_amend_manifest docker_delete_archive
+          make docker_load docker_tag docker_push docker_delete_archive
         done
       env:
         BUILD_REASON: "IndividualCI"
         BRANCH: ${{ github.ref }}
 
-    - name: Push container manifests
+    - name: Create multi-platform manifests
       shell: bash
-      run: make docker_push_manifest
+      run: make docker_amend_manifest
       env:
         BUILD_REASON: "IndividualCI"
         BRANCH: ${{ github.ref }}
+        MANIFEST_ARCHITECTURES: ${{ inputs.architectures }}
 
     - name: Sign container manifests
       shell: bash

Makefile.docker

@@ -19,6 +19,8 @@ ifdef DOCKER_ARCHITECTURE
   DOCKER_PLATFORM_TAG_SUFFIX = -$(DOCKER_ARCHITECTURE)
 endif
 
+MANIFEST_ARCHITECTURES ?= $(DOCKER_ARCHITECTURE)
+
 .PHONY: docker_build
 docker_build:
 	# Build Docker image ...
@@ -32,7 +34,7 @@ docker_build:
 .PHONY: docker_save
 docker_save:
 	# Saves the container as TGZ file
-	$(DOCKER_CMD) save strimzi/$(PROJECT_NAME):$(BUILD_TAG)$(DOCKER_PLATFORM_TAG_SUFFIX) | gzip > access-operator-container$(DOCKER_PLATFORM_TAG_SUFFIX).tar.gz
+	$(DOCKER_CMD) save $(DOCKER_PLATFORM) strimzi/$(PROJECT_NAME):$(BUILD_TAG)$(DOCKER_PLATFORM_TAG_SUFFIX) | gzip > access-operator-container$(DOCKER_PLATFORM_TAG_SUFFIX).tar.gz
 
 .PHONY: docker_load
 docker_load:
@@ -56,18 +58,12 @@ docker_delete_archive:
 
 .PHONY: docker_amend_manifest
 docker_amend_manifest:
-	# Create / Amend the manifest
-	$(DOCKER_CMD) manifest create $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG) --amend $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG)$(DOCKER_PLATFORM_TAG_SUFFIX)
-
-.PHONY: docker_push_manifest
-docker_push_manifest:
-	# Push the manifest to the registry
-	$(DOCKER_CMD) manifest push $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG)
-
-.PHONY: docker_delete_manifest
-docker_delete_manifest:
-	# Delete the manifest to the registry, ignore the error if manifest doesn't exist
-	$(DOCKER_CMD) manifest rm $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG) || true
+	# Create the multi-platform manifest from architecture-specific images
+	sources="" ; \
+	for arch in $$(echo "$(MANIFEST_ARCHITECTURES)" | tr ',' ' '); do \
+		sources="$$sources $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG)-$$arch" ; \
+	done ; \
+	$(DOCKER_CMD) buildx imagetools create -t $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG) $$sources
 
 .PHONY: docker_sign_manifest
 docker_sign_manifest: