Merge pull request #240 from kubenow/fix/docker-ci

Fix Docker release
kubenow · Sep 23, 2017 · 1b66a94 · 1b66a94
2 parents 1e34dee + 62c7e38
commit 1b66a94
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -130,18 +130,13 @@ jobs:
       before_script: true
       after_script: true
       script:
-        # Exit if not in master
-        - >
-            if [ $TRAVIS_BRANCH != 'master' ]; then
-              exit 0
-            fi
         # Build and push Docker image (needs to be build again in this stage)
         - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
         - >
-            if [ -z $TRAVIS_TAG ]; then
+            if [ $TRAVIS_BRANCH == 'master' ]; then
               docker build -t kubenow/provisioners:master .
               docker push kubenow/provisioners:master
-            else
+            elif [ ! -z $TRAVIS_TAG ]; then
               docker build -t kubenow/provisioners:$TRAVIS_TAG \
                 -t kubenow/provisioners:latest .
               docker push kubenow/provisioners:$TRAVIS_TAG