Merge pull request #16 from demokratie-live/sprint#5/travis

syntax

Author: ManAnRuck

.travis.yml

@@ -16,10 +16,10 @@ matrix:
             script:
                 - yarn lint
             after_success:
-                - if [ $TRAVIS_BRANCH == "master" ] then
+                - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
                     docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
                     export REPO="democracy/democracy-server";
-                    docker build -f Dockerfile -t $REPO:$COMMIT .
+                    docker build -f Dockerfile -t $REPO:$COMMIT .;
                     docker push $REPO;
                   fi
 after_script: