Merge cf5a321 into 1bd7143

kbase · Jul 6, 2018 · 2b42eaf · 2b42eaf
2 parents 1bd7143 + cf5a321
commit 2b42eaf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,7 @@ branches:
     - develop
     - master
     - travis-firefox
-    - dockerize
+    - staging
 
 before_install:
   - pip install virtualenv coveralls

diff --git a/scripts/push2dockerhub.sh b/scripts/push2dockerhub.sh
@@ -19,7 +19,7 @@ COMMIT=`git rev-parse --short HEAD`
 if ( [ "$TRAVIS_SECURE_ENV_VARS" == "true" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] ); then
     # $TAG was set from TRAVIS_BRANCH, which is a little wonky on pull requests,
     # but it should be okay since we should never get here on a PR
-    if  ( [ "$TAG" == "latest" ] || [ "$TAG" == "develop" ] || [ "$TAG" == "dockerize" ] ) ; then
+    if  ( [ "$TAG" == "latest" ] || [ "$TAG" == "develop" ] || [ "$TAG" == "staging" ] ) ; then
         echo "Logging into Dockerhub as $DOCKER_USER"
         docker login -u $DOCKER_USER -p $DOCKER_PASS && \
         docker tag $IMAGE_NAME:$COMMIT $IMAGE_NAME:$TAG && \