diff --git a/common.bash b/common.bash index 45039e1..159ddd2 100644 --- a/common.bash +++ b/common.bash @@ -1,2 +1,3 @@ maintainer="tier" imagename="midpoint" +version="3.9-SNAPSHOT-stable" diff --git a/jenkins-rebuild.sh b/jenkins-rebuild.sh index 5430852..6e778f0 100755 --- a/jenkins-rebuild.sh +++ b/jenkins-rebuild.sh @@ -2,16 +2,18 @@ # Temporary workaround for docker/util not rebuilding the specific version of the image +source common.bash . + # from destroy.sh (adapted) -result=$(docker ps -a | grep $maintainer/$imagename:$tag) +result=$(docker ps -a | grep $maintainer/$imagename:$version) if [ ! -z "$result" ]; then - docker rm -f $(docker ps -a | grep $maintainer/$imagename:$tag | awk '{print $1}') - docker rmi -f $maintainer/$imagename:$tag + docker rm -f $(docker ps -a | grep $maintainer/$imagename:$version | awk '{print $1}') + docker rmi -f $maintainer/$imagename:$version fi # from build.sh (adapted) -echo "Building new Docker image($maintainer/$imagename:$tag)" -docker build --rm -t $maintainer/$imagename:$tag --build-arg maintainer=$maintainer --build-arg imagename=$imagename . +echo "Building new Docker image($maintainer/$imagename:$version)" +docker build --rm -t $maintainer/$imagename:$version --build-arg maintainer=$maintainer --build-arg imagename=$imagename --build-arg version=$version .