???

Author: ulfgebhardt

.travis.yml

@@ -16,17 +16,11 @@ matrix:
             script:
                 - yarn lint
             after_success:
-                - test $TRAVIS_BRANCH = "master" && test $TRAVIS_PULL_REQUEST = "true" &&
-                  ( docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
+                - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_PULL_REQUEST == true ]; then
+                    docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
                     export REPO="democracy/democracy-server";
                     docker build -f Dockerfile -t $REPO:$COMMIT .;
-                    docker push $REPO;)
-                # docker on master branch
-                #- if [[ ("$TRAVIS_BRANCH" == "master") && ("$TRAVIS_PULL_REQUEST" == "true") ]]; then
-                #    docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
-                #    export REPO="democracy/democracy-server";
-                #    docker build -f Dockerfile -t $REPO:$COMMIT .;
-                #    docker push $REPO;
-                #  fi
+                    docker push $REPO;
+                  fi
 after_script:
   - echo "BUILD FINISHED"