Skip to content

merge 4.0.1 20200623 #84

Merged
merged 3 commits into from Jun 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Expand Up @@ -6,11 +6,11 @@ FROM centos:centos7
#
##tomcat \
ENV TOMCAT_MAJOR=9 \
TOMCAT_VERSION=9.0.35 \
TOMCAT_VERSION=9.0.36 \
##shib-idp \
VERSION=4.0.1 \
##TIER \
TIERVERSION=20200603 \
TIERVERSION=20200623 \
#################### \
#### OTHER VARS #### \
#################### \
Expand Down
13 changes: 12 additions & 1 deletion Jenkinsfile
Expand Up @@ -33,6 +33,7 @@ node('docker') {
stage 'Setting build context'

def maintainer = maintainer()
def previous_maintainer = previous_maintainer()
def imagename = imagename()
def tag

Expand Down Expand Up @@ -75,10 +76,15 @@ node('docker') {

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")
baseImg.push("$tag")
}

docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$previous_maintainer") {
def altImg = docker.build("$previous_maintainer/$imagename")
altImg.push("$tag")
}

stage 'Notify'

Expand All @@ -88,6 +94,11 @@ node('docker') {

def maintainer() {
def matcher = readFile('common.bash') =~ 'maintainer="(.+)"'
matcher ? matcher[0][1] : 'i2incommon'
}

def previous_maintainer() {
def matcher = readFile('common.bash') =~ 'previous_maintainer="(.+)"'
matcher ? matcher[0][1] : 'tier'
}

Expand Down
3 changes: 2 additions & 1 deletion common.bash
@@ -1,3 +1,4 @@
maintainer="tier"
maintainer="i2incommon"
previous_maintainer="tier"
imagename="shib-idp"