diff --git a/.travis.yml b/.travis.yml index 202264e..495151a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,6 @@ language: bash services: - docker -env: - global: - - COMMIT=${TRAVIS_COMMIT::8} - install: - sudo pip install --upgrade pip - pip install --user awscli diff --git a/deploy.sh b/deploy.sh index 2d398b8..d3a9911 100644 --- a/deploy.sh +++ b/deploy.sh @@ -5,6 +5,14 @@ echo "$DOCKER_TOKEN" | docker login -u "$DOCKER_USERNAME" --password-stdin APP="db" 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"