Merge branch 'release/v8.0.0.M21'

nbaars · nbaars · commit 3536fd0b6daf · 2018-06-20T18:23:59.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,6 @@ deploy:
     on:
       repo: WebGoat/WebGoat
       tags: true
-      branch: master
   - provider: releases
     skip_cleanup: true
     overwrite: true
@@ -40,7 +39,6 @@ deploy:
     on:
       repo: WebGoat/WebGoat
       tags: true
-      branch: master
 env:
   global:
   #Docker login
diff --git a/scripts/deploy-webgoat.sh b/scripts/deploy-webgoat.sh
@@ -6,7 +6,7 @@ export REPO=webgoat/webgoat-8.0
 cd webgoat-server
 ls target/
 
-if [ "${BRANCH}" == "master" ] && [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${TRAVIS_TAG}" ]; then
   # If we push a tag to master this will update the LATEST Docker image and tag with the version number
   docker build --build-arg webgoat_version=${TRAVIS_TAG:1} -f Dockerfile -t $REPO:latest -t $REPO:${TRAVIS_TAG} .
   docker push $REPO
@@ -27,14 +27,10 @@ cd ..
 cd webwolf
 ls target/
 
-if [ "${BRANCH}" == "master" ] && [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${TRAVIS_TAG}" ]; then
   # If we push a tag to master this will update the LATEST Docker image and tag with the version number
   docker build --build-arg webwolf_version=${TRAVIS_TAG:1} -f Dockerfile -t $REPO:latest -t $REPO:${TRAVIS_TAG} .
   docker push $REPO
-elif [ ! -z "${TRAVIS_TAG}" ]; then
-  # Creating a tag build we push it to Docker with that tag
-  docker build --build-arg webwolf_version=${TRAVIS_TAG:1} -f Dockerfile -t $REPO:${TRAVIS_TAG} -t $REPO:latest .
-  docker push $REPO
 else
   echo "Skipping releasing to DockerHub because it is a build of branch ${BRANCH}"
 fi
