From c8a9fba39944e9e25e2f9dda4aa6a7b05217a628 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Tue, 23 Jun 2020 20:25:17 +0000
Subject: [PATCH] bump tomcat, add push to new registry

---
 Dockerfile  |  4 ++--
 Jenkinsfile | 10 ++++++++++
 common.bash |  3 ++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 99d4318..121c541 100644
--- a/Dockerfile
+++ b/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 #### \
 #################### \
diff --git a/Jenkinsfile b/Jenkinsfile
index 9ea40c4..26a335d 100644
--- a/Jenkinsfile
+++ b/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'
 }
 
diff --git a/common.bash b/common.bash
index 7ff214b..0d17e74 100644
--- a/common.bash
+++ b/common.bash
@@ -1,3 +1,4 @@
-maintainer="tier"
+maintainer="i2incommon"
+previous_maintainer="tier"
 imagename="shib-idp"