From bb1239600ab463fb5331b8a4261d12419bb0096f Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Fri, 12 Aug 2016 14:56:20 -0400 Subject: [PATCH] Re-releasing at latest --- Jenkinsfile | 10 +++++++++- bin/ci-run.sh | 1 + bin/ci-stop.sh | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9c5c080..6b2ba10 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,15 @@ node('docker') { def maintainer = maintainer() def imagename = imagename() - def tag = env.BRANCH_NAME + def tag + + // Tag images created on master branch with 'latest' + if(env.BRANCH_NAME == "master"){ + tag = "latest" + }else{ + tag = env.BRANCH_NAME + } + if(!imagename){ echo "You must define an imagename in common.bash" currentBuild.result = 'FAILURE' diff --git a/bin/ci-run.sh b/bin/ci-run.sh index 80b6c0d..4ef1dc0 100755 --- a/bin/ci-run.sh +++ b/bin/ci-run.sh @@ -4,3 +4,4 @@ source common.bash . docker run -d --name=$imagename -p 80:80 -p 443:443 $maintainer/$imagename + diff --git a/bin/ci-stop.sh b/bin/ci-stop.sh index 416db9e..54ab019 100755 --- a/bin/ci-stop.sh +++ b/bin/ci-stop.sh @@ -5,4 +5,4 @@ source common.bash . echo "Cleaning up Docker image($maintainer/$imagename)" docker stop $imagename >> /dev/null -docker rm $imagename \ No newline at end of file +docker rm $imagename