chore(deploy.sh): adhere to standard location

Fixes #16

Author: Seth Goings

.travis.yml

@@ -16,6 +16,6 @@ script:
   - make test
 deploy:
   provider: script
-  script: contrib/ci/deploy.sh
+  script: _scripts/deploy.sh
   on:
     branch: master

Makefile

@@ -6,7 +6,7 @@ include includes.mk
 # - Kubernetes service, rc, pod, secret, volume names
 SHORT_NAME := postgres
 
-BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
+VERSION ?= git-$(shell git rev-parse --short HEAD)
 
 # Legacy support for DEV_REGISTRY, plus new support for DEIS_REGISTRY.
 DEIS_REGISTRY ?= ${DEV_REGISTRY}
@@ -16,7 +16,7 @@ IMAGE_PREFIX ?= deis/
 # Kubernetes-specific information for RC, Service, and Image.
 RC := contrib/kubernetes/manifests/${SHORT_NAME}-rc.tmp.yaml
 SVC := contrib/kubernetes/manifests/${SHORT_NAME}-service.yaml
-IMAGE := ${DEIS_REGISTRY}/${IMAGE_PREFIX}${SHORT_NAME}:${BUILD_TAG}
+IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}${SHORT_NAME}:${VERSION}
 
 all:
 	@echo "Use a Makefile to control top-level building of the project."

contrib/ci/deploy.sh _scripts/deploy.shcontrib/ci/deploy.sh renamed to _scripts/deploy.sh

@@ -5,7 +5,8 @@
 
 cd "$(dirname "$0")" || exit 1
 
-docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" docker.io
-DEIS_REGISTRY=docker.io IMAGE_PREFIX=deisci/ BUILD_TAG=v2-alpha make -C ../.. docker-build docker-push
+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
-DEIS_REGISTRY=quay.io IMAGE_PREFIX=deisci/ BUILD_TAG=v2-alpha make -C ../.. docker-build docker-push
+DEIS_REGISTRY=quay.io make -C .. docker-build docker-push