From d62c03482146ac4127aae46597bed0d73f931ba4 Mon Sep 17 00:00:00 2001 From: anandtiwarics Date: Sat, 22 Sep 2018 23:53:55 +0530 Subject: [PATCH] update --- .travis.yml | 6 +++--- integration-test.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3c9abfe..dccc8b98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ services: before_script: - export -f travis_fold - export REPO=archerysec/archerysec - - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` + - export TRAVIS_TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` script: - | @@ -52,5 +52,5 @@ after_success: if [ "$TRAVIS_TAG" != "" ] && [ "$DOCKER_USER" != "" ] && [ "$DOCKER_PASS" != "" ]; then docker tag $REPO $REPO:$TRAVIS_TAG docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"; - docker push $REPO:latest ; - fi + docker push $REPO ; + fi \ No newline at end of file diff --git a/integration-test.sh b/integration-test.sh index b8bf1a1b..33988376 100644 --- a/integration-test.sh +++ b/integration-test.sh @@ -9,7 +9,7 @@ docker logs $CONTAINER_NAME pip install bandit docker ps -a docker logs $CONTAINER_NAME -echo "Checking to see if dojo is running" +echo "Checking to see if Archery is running" # Check whether the container is running and came up as expected set +e