Skip to content
This repository was archived by the owner on Oct 28, 2024. It is now read-only.

Commit d114deb

Browse files
authored
Merge pull request #51 from gyliu513/makefile
Do not add slash for REGISTRY with non google cloud
2 parents 3a84c2d + 660c3df commit d114deb

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/golangci-lint)
5555
ENVSUBST := $(abspath $(TOOLS_BIN_DIR)/envsubst)
5656

5757
# Define Docker related variables. Releases should modify and double check these vars.
58+
REGISTRY ?= gcr.io
59+
ifneq ($(shell gcloud config get-value project), )
5860
REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
61+
endif
5962
STAGING_REGISTRY ?= gcr.io/k8s-staging-cluster-api-provider-nested
6063
PROD_REGISTRY ?= us.gcr.io/k8s-artifacts-prod/cluster-api-provider-nested
6164
IMAGE_NAME ?= cluster-api-nested-controller

0 commit comments

Comments
 (0)