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

Do not add slash for REGISTRY with non google cloud #51

Merged
merged 1 commit into from
May 6, 2021
Merged

Do not add slash for REGISTRY with non google cloud #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/golangci-lint)
ENVSUBST := $(abspath $(TOOLS_BIN_DIR)/envsubst)

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