bump tomcat, add push to new registry

Dockerfile

@@ -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 #### \
 #################### \

Jenkinsfile

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

common.bash

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