[gitlab] load bundle image (#1104)

DataDog · Feb 28, 2024 · 9037e74 · 9037e74
1 parent 15598ff
commit 9037e74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -131,7 +131,7 @@ build_bundle_image:
     TARGET_IMAGE: $BUILD_DOCKER_REGISTRY/$PROJECTNAME:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-bundle
     RELEASE_IMAGE: $BUILD_DOCKER_REGISTRY/$PROJECTNAME:$CI_COMMIT_TAG-bundle
   script:
-    - BUNDLE_IMG=$TARGET_IMAGE make bundle-build
+    - BUNDLE_IMG=$TARGET_IMAGE make bundle-build-load
     - if [ -n "$CI_COMMIT_TAG" ]; then docker buildx imagetools create $TARGET_IMAGE --tag $RELEASE_IMAGE; fi
 
 

diff --git a/Makefile b/Makefile
@@ -224,9 +224,9 @@ bundle: bin/$(PLATFORM)/operator-sdk bin/$(PLATFORM)/yq $(KUSTOMIZE) manifests #
 bundle-redhat: bin/$(PLATFORM)/operator-manifest-tools
 	hack/redhat-bundle.sh
 
-.PHONY: bundle-build
-bundle-build: ## Build the bundle image.
-	docker buildx build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
+.PHONY: bundle-build-load
+bundle-build: ## Build and load the bundle image.
+	docker buildx build --load -f bundle.Dockerfile -t $(BUNDLE_IMG) .
 
 .PHONY: bundle-push
 bundle-push: