ref(Makefile): use preferred env vars for build

Author: mboersma

Makefile

@@ -1,10 +1,10 @@
 # If DEIS_REGISTRY is not set, try to populate it from legacy DEV_REGISTRY
-DEIS_REGISTRY ?= $(DEV_REGISTRY)
+DEIS_REGISTRY ?= $(DEV_REGISTRY)/
 IMAGE_PREFIX ?= deis
 COMPONENT ?= workflow
-BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
-IMAGE = $(DEIS_REGISTRY)/$(IMAGE_PREFIX)/$(COMPONENT):$(BUILD_TAG)
-SHELL_SCRIPTS = $(wildcard rootfs/bin/*) $(shell find "rootfs" -name '*.sh') $(shell find "_scripts/ci" -name '*.sh')
+VERSION ?= git-$(shell git rev-parse --short HEAD)
+IMAGE = $(DEIS_REGISTRY)$(IMAGE_PREFIX)/$(COMPONENT):$(VERSION)
+SHELL_SCRIPTS = $(wildcard rootfs/bin/*) $(shell find "rootfs" -name '*.sh') $(wildcard _scripts/*.sh)
 
 check-docker:
 	@if [ -z $$(which docker) ]; then \

_scripts/deploy.sh

@@ -5,8 +5,8 @@
 
 cd "$(dirname "$0")" || exit 1
 
-export IMAGE_PREFIX=deisci BUILD_TAG=v2-alpha
+export IMAGE_PREFIX=deisci VERSION=v2-alpha
 docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-REGISTRY='' make -C .. docker-build docker-push
+DEIS_REGISTRY='' make -C .. docker-build docker-push
 docker login -e="$QUAY_EMAIL" -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io
-REGISTRY=quay.io/ make -C .. docker-build docker-push
+DEIS_REGISTRY=quay.io/ make -C .. docker-build docker-push