fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Add BUILD_REGISTRY option to our build mechanism

Signed-off-by: Jakub Stejskal <[email protected]>

Author: Frawless

.github/actions/build-strimzi-binaries/action.yml

@@ -31,9 +31,9 @@ runs:
       uses: actions/cache@v4
       with:
         path: ~/.m2/repository
-        key: "maven-cache | ${{ github.job }} | **/pom.xml"
+        key: "maven-cache | ${{ github.run_id }} | **/pom.xml"
         restore-keys: |
-          maven | ${{ github.job }}
+          maven | ${{ github.run_id }}
           maven
     - name: Cache Kafka binaries
       uses: actions/cache@v4

.github/actions/containers-load/action.yml

@@ -24,14 +24,8 @@ runs:
 
     - name: Load Strimzi images
       shell: bash
-      # TODO - check if eval is really needed?
-      #        eval $(minikube docker-env)
       run: |
-        make docker_load 
-        make docker_tag 
-        make docker_push 
-        docker images -a
-        make docker_amend_manifest docker_delete_archive
-        docker images -a
+        eval $(minikube docker-env)
+        make docker_load docker_tag docker_push docker_create_manifest docker_delete_archive
       env:
         DOCKER_ARCHITECTURE: ${{ inputs.architecture }}

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

@@ -6,7 +6,6 @@ runs:
   steps:
     - name: Push containers manifest
       shell: bash
-      # TODO - check if eval is really needed
-      #        eval $(minikube docker-env)
       run: |
+        eval $(minikube docker-env)
         make docker_push_manifest

Makefile.docker

@@ -68,6 +68,11 @@ 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)
 
+.PHONY: docker_create_manifest_default
+docker_create_manifest_default:
+	# Create the manifest (CI only - TODO - maybe revert?)
+	$(DOCKER_CMD) manifest create $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG)$(DOCKER_PLATFORM_TAG_SUFFIX)
+
 .PHONY: docker_push_manifest_default
 docker_push_manifest_default:
 	# Push the manifest to the registry