diff --git a/.github/workflows/olm_tests.yaml b/.github/workflows/olm_tests.yaml index cbe8dd67e..787f3ac5f 100644 --- a/.github/workflows/olm_tests.yaml +++ b/.github/workflows/olm_tests.yaml @@ -42,7 +42,7 @@ jobs: # TODO: Use operator-sdk run bundle and bundle-upgrade commands for # testing with OLM. OPERATOR_VERSION=$(awk '/^VERSION \?=/ {print $3}' Makefile) - REPO=http://localhost:5000 + REPO=localhost:5000 IMG=${REPO}/gatekeeper-operator:${GITHUB_SHA} PREV_BUNDLE_INDEX_IMG=quay.io/gatekeeper/gatekeeper-operator-bundle-index:$(make get-replaces-version) make build-and-push-bundle-images IMG=${IMG} REPO=${REPO} VERSION=${GITHUB_SHA} OPERATOR_VERSION=${OPERATOR_VERSION} diff --git a/Makefile b/Makefile index 36e0843db..beeff99cb 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ DOCKER ?= docker # # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both # gatekeeper.sh/gatekeeper-operator-bundle:$VERSION and gatekeeper.sh/gatekeeper-operator-catalog:$VERSION. -REPO ?= localhost:5000 +REPO ?= quay.io/gatekeeper IMAGE_TAG_BASE ?= $(REPO)/gatekeeper-operator # BUNDLE_IMG defines the image:tag used for the bundle. @@ -376,7 +376,7 @@ endif # Generate and push bundle image and bundle index image # Note: OPERATOR_VERSION is an arbitrary number and does not need to match any official versions .PHONY: build-and-push-bundle-images -build-and-push-bundle-images: # docker-build docker-push +build-and-push-bundle-images: docker-build docker-push $(MAKE) bundle VERSION=$(OPERATOR_VERSION) $(MAKE) bundle-build $(MAKE) docker-push IMG=$(BUNDLE_IMG)