Use docker iamgetools to handling image manifests instead of manifest sub-command

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

Author: Frawless

.azure/templates/jobs/build/push_containers.yaml

@@ -58,14 +58,6 @@ jobs:
               DOCKER_ORG: "strimzi"
               DOCKER_TAG: '${{ parameters.dockerTag }}'
               DOCKER_ARCHITECTURE: ${{ arch }}
-      - bash: "make docker_push_manifest"
-        displayName: "Push container manifests"
-        env:
-          BUILD_REASON: $(Build.Reason)
-          BRANCH: $(Build.SourceBranch)
-          DOCKER_REGISTRY: "quay.io"
-          DOCKER_ORG: "strimzi"
-          DOCKER_TAG: '${{ parameters.dockerTag }}'
       - bash: "make docker_sign_manifest"
         displayName: "Sign container manifests"
         env:

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

@@ -91,13 +91,6 @@ runs:
         BUILD_REASON: "IndividualCI"
         BRANCH: ${{ github.ref }}
 
-    - name: Push container manifests
-      shell: bash
-      run: make docker_push_manifest
-      env:
-        BUILD_REASON: "IndividualCI"
-        BRANCH: ${{ github.ref }}
-
     - name: Sign container manifests
       shell: bash
       run: make docker_gha_sign_manifest

Makefile

@@ -16,7 +16,7 @@ endif
 
 SUBDIRS=kafka-agent tracing-agent crd-annotations test crd-generator api v1-api-conversion mockkube certificate-manager operator-common config-model config-model-generator cluster-operator topic-operator user-operator kafka-init systemtest docker-images/artifacts packaging/helm-charts/helm3 packaging/install packaging/examples
 DOCKERDIRS=docker-images/base docker-images/operator docker-images/kafka-based docker-images/maven-builder docker-images/kaniko-executor docker-images/buildah
-DOCKER_TARGETS=docker_build docker_push docker_tag docker_load docker_save docker_amend_manifest docker_push_manifest docker_sign_manifest docker_delete_manifest docker_delete_archive docker_sbom docker_push_sbom docker_e2e docker_gha_sign_manifest docker_gha_sbom docker_gha_push_sbom
+DOCKER_TARGETS=docker_build docker_push docker_tag docker_load docker_save docker_amend_manifest docker_sign_manifest docker_delete_manifest docker_delete_archive docker_sbom docker_push_sbom docker_e2e docker_gha_sign_manifest docker_gha_sbom docker_gha_push_sbom
 JAVA_TARGETS=java_build java_install java_clean
 
 all: prerequisites_check $(SUBDIRS) $(DOCKERDIRS) crd_install dashboard_install helm_install shellcheck docu_versions docu_check

Makefile.docker

@@ -63,19 +63,14 @@ docker_delete_archive_default:
 .PHONY: docker_amend_manifest_default
 docker_amend_manifest_default:
 	# 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)
+	$(DOCKER_CMD) buildx imagetools create --append -t $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG)$(DOCKER_PLATFORM_TAG_SUFFIX)
 
 .PHONY: docker_e2e_default
 docker_e2e_default:
 	# Re-tag and push arch-specific images to latest to use it within CI only
 	$(DOCKER_CMD) tag strimzi/$(PROJECT_NAME):$(BUILD_TAG)$(DOCKER_PLATFORM_TAG_SUFFIX) $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG)
 	$(DOCKER_CMD) push $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG)
 
-.PHONY: docker_push_manifest_default
-docker_push_manifest_default:
-	# Push the manifest to the registry
-	$(DOCKER_CMD) manifest push $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG)
-
 .PHONY: docker_sign_manifest_default
 docker_sign_manifest_default:
 	# Signs the manifest and its images

docker-images/Makefile

@@ -1,7 +1,7 @@
 TOPDIR=$(dir $(lastword $(MAKEFILE_LIST)))
 
 DOCKERDIRS=base operator kafka-based maven-builder kaniko-executor buildah
-DOCKER_TARGETS=docker_build docker_push docker_tag docker_load docker_save docker_amend_manifest docker_push_manifest docker_delete_manifest docker_delete_archive docker_sbom docker_push_sbom docker_e2e
+DOCKER_TARGETS=docker_build docker_push docker_tag docker_load docker_save docker_amend_manifest docker_delete_manifest docker_delete_archive docker_sbom docker_push_sbom docker_e2e
 
 all: $(DOCKERDIRS)
 $(DOCKER_TARGETS): $(DOCKERDIRS)

docker-images/base/Makefile

@@ -12,9 +12,6 @@ docker_amend_manifest:
 docker_e2e:
 	# Do nothing
 
-docker_push_manifest:
-	# Do nothing
-
 docker_sign_manifest:
 	# Do nothing
 

docker-images/kafka-based/Makefile

@@ -1,6 +1,6 @@
 TOPDIR = $(dir $(lastword $(MAKEFILE_LIST)))
 RELEASE_VERSION ?= $(shell cat $(TOPDIR)/release.version)
-DOCKER_TARGETS = docker_build docker_push docker_tag docker_load docker_save docker_amend_manifest docker_push_manifest docker_delete_manifest docker_delete_archive docker_sbom docker_push_sbom
+DOCKER_TARGETS = docker_build docker_push docker_tag docker_load docker_save docker_amend_manifest docker_delete_manifest docker_delete_archive docker_sbom docker_push_sbom
 DOCKER_TAG ?= latest
 
 .PHONY: build clean release all $(DOCKER_TARGETS)
@@ -29,9 +29,6 @@ docker_amend_manifest:
 docker_e2e:
 	./build.sh docker_e2e
 
-docker_push_manifest:
-	./build.sh docker_push_manifest
-
 docker_sign_manifest:
 	./build.sh docker_sign_manifest