From 274067a2b4c13e711707a9b5538c644319dfa65c Mon Sep 17 00:00:00 2001 From: Michelle Noorali Date: Thu, 14 Apr 2016 14:38:00 -0600 Subject: [PATCH] ref(Makefile): add default registry + "/"s --- Makefile | 4 ++-- versioning.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 308737dcb..e80d68faa 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -DOCKER_REGISTRY := -IMAGE_PREFIX ?= helm +DOCKER_REGISTRY ?= gcr.io +IMAGE_PREFIX ?= deis-sandbox SHORT_NAME ?= tiller # go option diff --git a/versioning.mk b/versioning.mk index 2faa2ec6f..8d96c8629 100644 --- 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}"