Merge pull request #181 from sgoings/travis-deploy

fix(Makefile/travis): use standard vars

Author: Seth Goings

Makefile

@@ -2,12 +2,12 @@
 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)
+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)
 
 info:
-	@echo "Build tag:  ${BUILD_TAG}"
+	@echo "Build tag:  ${VERSION}"
 	@echo "Registry:   ${DEIS_REGISTRY}"
 	@echo "Image:      ${IMAGE}"
 
@@ -20,10 +20,10 @@ check-docker:
 prep-bintray-json:
 # TRAVIS_TAG is set to the tag name if the build is a tag
 ifdef TRAVIS_TAG
-	@jq '.version.name |= "$(BUILD_TAG)"' _scripts/ci/bintray-template.json | \
+	@jq '.version.name |= "$(VERSION)"' _scripts/ci/bintray-template.json | \
 		jq '.package.repo |= "deis"' > _scripts/ci/bintray-ci.json
 else
-	@jq '.version.name |= "$(BUILD_TAG)"' _scripts/ci/bintray-template.json \
+	@jq '.version.name |= "$(VERSION)"' _scripts/ci/bintray-template.json \
 		> _scripts/ci/bintray-ci.json
 endif
 

_scripts/deploy.sh

@@ -5,7 +5,7 @@
 
 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"
 DEIS_REGISTRY='' make -C .. docker-build docker-push
 docker login -e="$QUAY_EMAIL" -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io