Skip to content
Permalink
Browse files

bump tomcat, add push to new registry

  • Loading branch information
pcaskey committed Jun 23, 2020
1 parent 85c6540 commit c8a9fba39944e9e25e2f9dda4aa6a7b05217a628
Showing with 14 additions and 3 deletions.
  1. +2 −2 Dockerfile
  2. +10 −0 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 #### \
#################### \
@@ -79,6 +79,11 @@ node('docker') {
def baseImg = docker.build("$maintainer/$imagename")
baseImg.push("$tag")
}

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

stage 'Notify'

@@ -88,6 +93,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 c8a9fba

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