diff --git a/Dockerfile b/Dockerfile index 4651b8f..dd92f08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM centos:centos7 # Define args and set a default value ARG maintainer=tier ARG imagename=shibboleth_sp -ARG version=3.3.0 -ARG TIERVERSION=20211202 +ARG version=3.4.0 +ARG TIERVERSION=20221103 MAINTAINER $maintainer LABEL Vendor="Internet2" diff --git a/Jenkinsfile b/Jenkinsfile index 74578ef..33dcdb7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,6 +17,7 @@ node('docker') { stage 'Setting build context' def maintainer = maintainer() + def previous_maintainer = previous_maintainer() def imagename = imagename() def tag @@ -64,10 +65,16 @@ node('docker') { sh 'bin/ci-stop.sh' stage 'Push' - docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") { + docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$previous_maintainer") { def baseImg = docker.build("$maintainer/$imagename", "--no-cache .") baseImg.push("$tag") } + + docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$previous_maintainer") { + def altImg = docker.build("$previous_maintainer/$imagename", "--no-cache .") + altImg.push("$tag") + } + stage 'Notify' @@ -79,6 +86,11 @@ def maintainer() { matcher ? matcher[0][1] : 'tier' } +def previous_maintainer() { + def matcher = readFile('common.bash') =~ 'previous_maintainer="(.+)"' + matcher ? matcher[0][1] : 'tier' +} + def imagename() { def matcher = readFile('common.bash') =~ 'imagename="(.+)"' matcher ? matcher[0][1] : null diff --git a/common.bash b/common.bash index 12b9757..ec9ab3d 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,4 @@ -maintainer="tier" +maintainer="i2incommon" +previous_maintainer="tier" imagename="shibboleth_sp" -version="3.2.3" +version="3.4.0"