ref(Makefile): add default registry + "/"s

9 years ago · 274067a2b4
parent 338dc6d4fe
commit 274067a2b4
2 changed files with 4 additions and 4 deletions
--- a/4
+++ b/4
@ -1,5 +1,5 @@
-DOCKER_REGISTRY :=
-IMAGE_PREFIX    ?= helm
+DOCKER_REGISTRY ?= gcr.io
+IMAGE_PREFIX    ?= deis-sandbox
 SHORT_NAME      ?= tiller

 # go option
--- a/versioning.mk
+++ b/versioning.mk
@ -1,8 +1,8 @@
 MUTABLE_VERSION ?= canary
 VERSION ?= git-$(shell git rev-parse --short HEAD)

-IMAGE := ${DOCKER_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
-MUTABLE_IMAGE := ${DOCKER_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION}
+IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
+MUTABLE_IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION}

 info:
 	@echo "Build tag:       ${VERSION}"