Skip to content

Commit

Permalink
Re-releasing at latest
Browse files Browse the repository at this point in the history
  • Loading branch information
Jim Van Fleet committed Aug 12, 2016
1 parent eedbc34 commit bb12396
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
10 changes: 9 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions bin/ci-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
source common.bash .

docker run -d --name=$imagename -p 80:80 -p 443:443 $maintainer/$imagename

2 changes: 1 addition & 1 deletion bin/ci-stop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ source common.bash .

echo "Cleaning up Docker image($maintainer/$imagename)"
docker stop $imagename >> /dev/null
docker rm $imagename
docker rm $imagename

0 comments on commit bb12396

Please sign in to comment.