diff --git a/.travis.yml b/.travis.yml index d5dbd199..dc102e83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,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 a4a83231..a1abbca9 100755 --- a/deploy.sh +++ b/deploy.sh @@ -4,6 +4,14 @@ echo "$DOCKER_TOKEN" | docker login -u "$DOCKER_USERNAME" --password-stdin || exit 1 REPO="sartography/cr-connect-workflow" TAG=$(if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo "$TRAVIS_BRANCH" ; fi) + +echo "REPO = $REPO" +echo "TAG = $TAG" +echo "COMMIT = $COMMIT" +echo "REPO:COMMIT = $REPO:$COMMIT" +echo "REPO:TAG = $REPO:$TAG" +echo "REPO:travis-TRAVIS_BUILD_NUMBER = $REPO:travis-$TRAVIS_BUILD_NUMBER" + docker build -f Dockerfile -t "$REPO:$COMMIT" . || exit 1 docker tag "$REPO:$COMMIT" "$REPO:$TAG" || exit 1 docker tag "$REPO:$COMMIT" "$REPO:travis-$TRAVIS_BUILD_NUMBER" || exit 1 @@ -16,4 +24,5 @@ sleep 30 # Notify DC/OS that Docker image has been updated echo "Refreshing DC/OS..." STAGE=$(if [ "$TRAVIS_BRANCH" == "master" ]; then echo "production"; else echo "$TRAVIS_BRANCH" ; fi) +echo "STAGE = $STAGE" aws sqs send-message --region "$AWS_DEFAULT_REGION" --queue-url "$AWS_SQS_URL" --message-body "crconnect/$STAGE/backend" || exit 1