diff --git a/.travis.yml b/.travis.yml index 1f7d01d..495151a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ deploy: skip_cleanup: true on: all_branches: true -# condition: $TRAVIS_BRANCH =~ ^(testing|staging|master)$ + condition: $TRAVIS_BRANCH =~ ^(testing|staging|master)$ notifications: email: diff --git a/deploy.sh b/deploy.sh index 94b9756..83f7f0d 100644 --- a/deploy.sh +++ b/deploy.sh @@ -7,12 +7,6 @@ REPO="sartography/cr-connect-$APP" TAG=$(if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo "$TRAVIS_BRANCH" ; fi) COMMIT=${TRAVIS_COMMIT::8} -echo "APP = $APP" -echo "REPO = $REPO" -echo "TAG = $TAG" -echo "TRAVIS_COMMIT = $TRAVIS_COMMIT" -echo "COMMIT = $COMMIT" - docker build -f Dockerfile -t "$REPO:$COMMIT" . docker tag "$REPO:$COMMIT" "$REPO:$TAG" docker tag "$REPO:$COMMIT" "$REPO:travis-$TRAVIS_BUILD_NUMBER"