Skip to content
Permalink
Browse files

Merge pull request #84 from docker/4.0.1_20200623

merge 4.0.1 20200623
  • Loading branch information
pcaskey committed Jun 23, 2020
2 parents 20f3bc8 + 8acafa2 commit 27b8dff78ff07d13aaf30f8c0c9fdc59d123174b
Showing with 16 additions and 4 deletions.
  1. +2 −2 Dockerfile
  2. +12 −1 Jenkinsfile
  3. +2 −1 common.bash
@@ -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 #### \
#################### \
@@ -33,6 +33,7 @@ node('docker') {
stage 'Setting build context'

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

@@ -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'

@@ -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'
}

@@ -1,3 +1,4 @@
maintainer="tier"
maintainer="i2incommon"
previous_maintainer="tier"
imagename="shib-idp"

0 comments on commit 27b8dff

Please sign in to comment.
You can’t perform that action at this time.