Fix local build scripts

Author: mbaldessari

Makefile

@@ -303,7 +303,7 @@ bundle-build: ## Build the bundle image.
 
 .PHONY: bundle-push
 bundle-push: ## Push the bundle image.
-	$(MAKE) docker-push IMG=$(BUNDLE_IMG)
+	docker push $(BUNDLE_IMG)
 
 .PHONY: csv-date
 csv-date: ## Set createdAt date in the CSV.
@@ -362,7 +362,7 @@ catalog-build: opm ## Build an OLM catalog image (for testing).
 
 .PHONY: catalog-push
 catalog-push: ## Push the OLM catalog image (for testing).
-	$(MAKE) docker-push IMG=$(CATALOG_IMG)
+	docker push $(CATALOG_IMG)
 
 .PHONY: catalog-install
 catalog-install: config/samples/pattern-catalog-$(VERSION).yaml ## Install the OLM catalog on a cluster (for testing).

hack/operator-build-deploy.sh

@@ -6,6 +6,7 @@ NS="openshift-operators"
 OPERATOR="patterns-operator"
 VERSION="${VERSION:-6.6.6}"
 REGISTRY="${REGISTRY:-kuemper.int.rhx/bandini}"
+UPLOADREGISTRY="${UPLOADREGISTRY:-kuemper.int.rhx/bandini}"
 
 wait_for_resource() {
     local resource_type=$1  # Either "packagemanifest", "operator", or "csv"
@@ -74,7 +75,7 @@ if [ $ret -ne 0 ]; then
     exit 1
 fi
 
-make VERSION=${VERSION} IMAGE_TAG_BASE=${REGISTRY}/patterns-operator CHANNELS=fast USE_IMAGE_DIGESTS="" \
+make VERSION=${VERSION} UPLOADREGISTRY="${UPLOADREGISTRY}" IMAGE_TAG_BASE=${REGISTRY}/patterns-operator CHANNELS=fast USE_IMAGE_DIGESTS="" \
     manifests bundle generate docker-build docker-push bundle-build bundle-push catalog-build \
     catalog-push catalog-install