From 26251a199f818bb5c76cd3e2018f65dcd9986949 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Thu, 7 May 2020 10:25:06 -0400 Subject: [PATCH] Moves commit variable into deploy script --- .travis.yml | 3 --- deploy.sh | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca5f11f2..913400c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,9 +24,6 @@ install: env: - PB_BASE_URL='http://workflow.sartography.com:5001/pb/' - global: - - COMMIT=${TRAVIS_COMMIT::8} - script: - pipenv run coverage run -m pytest - pipenv run coverage xml -i diff --git a/deploy.sh b/deploy.sh index aa52808d..86845e93 100755 --- a/deploy.sh +++ b/deploy.sh @@ -4,6 +4,7 @@ echo "$DOCKER_TOKEN" | docker login -u "$DOCKER_USERNAME" --password-stdin REPO="sartography/cr-connect-workflow" TAG=$(if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo "$TRAVIS_BRANCH" ; fi) +COMMIT=${$TRAVIS_COMMIT::8} docker build -f Dockerfile -t "$REPO:$COMMIT" . docker tag "$REPO:$COMMIT" "$REPO:$TAG" docker tag "$REPO:$COMMIT" "$REPO:travis-$TRAVIS_BUILD_NUMBER"