From 9532dc20f7f04ddf09143c216d650e9cbf0ca113 Mon Sep 17 00:00:00 2001
From: Paul McLanahan <pmac@mozilla.com>
Date: Tue, 26 Jan 2016 11:29:55 -0500
Subject: [PATCH] Switch to moztravis docker hub account

---
 .travis.yml          | 2 +-
 bin/deploy-travis.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d17edc1..05d8a26 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
     # Docker
     - DOCKER_REPOSITORY=mozorg/basket
     - DOCKER_EMAIL=foo@example.com
-    - DOCKER_USERNAME=mozjenkins
+    - DOCKER_USERNAME=moztravis
     # MySQL
     - MYSQL_DATABASE=basket
     - MYSQL_ALLOW_EMPTY_PASSWORD=1
diff --git a/bin/deploy-travis.sh b/bin/deploy-travis.sh
index 2982580..4cad63d 100755
--- a/bin/deploy-travis.sh
+++ b/bin/deploy-travis.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-set -e
+set -ex
 
 docker login -e "$DOCKER_EMAIL" -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
-docker push ${DOCKER_REPOSITORY}:${TRAVIS_COMMIT}
-docker tag -f ${DOCKER_REPOSITORY}:${TRAVIS_COMMIT} ${DOCKER_REPOSITORY}:last_successful_build
+docker push ${DOCKER_IMAGE_TAG}
+docker tag -f ${DOCKER_IMAGE_TAG} ${DOCKER_REPOSITORY}:last_successful_build
 docker push ${DOCKER_REPOSITORY}:last_successful_build
 
 # Install deis client
@@ -15,7 +15,7 @@ for region in us-west eu-west; do
     DEIS_CONTROLLER=https://deis.${region}.moz.works
     NR_APP="${DEIS_APP}-${region}"
     ./deis login $DEIS_CONTROLLER  --username $DEIS_USERNAME --password $DEIS_PASSWORD
-    ./deis pull ${DOCKER_REPOSITORY}:${TRAVIS_COMMIT} -a $DEIS_APP
+    ./deis pull ${DOCKER_IMAGE_TAG} -a $DEIS_APP
     curl -H "x-api-key:$NEWRELIC_API_KEY" \
          -d "deployment[app_name]=$NR_APP" \
          -d "deployment[revision]=$TRAVIS_COMMIT" \