From 9b808b5a07234f6fff70263d08bd4181ed8cb1a2 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Mon, 7 Jun 2021 14:45:00 +0000
Subject: [PATCH] bump idp, tomcat, switch tomcat url to archive

---
 Dockerfile                                   | 8 ++++----
 container_files/idp/idp.installer.properties | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 202b363..4f20514 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,11 +6,11 @@ FROM centos:centos7
 #
 ##tomcat \
 ENV TOMCAT_MAJOR=9 \
-    TOMCAT_VERSION=9.0.44 \
+    TOMCAT_VERSION=9.0.46 \
 ##shib-idp \
-    VERSION=4.1.0 \
+    VERSION=4.1.2 \
 ##TIER \
-    TIERVERSION=20210324 \
+    TIERVERSION=20210607 \
 #################### \
 #### OTHER VARS #### \
 #################### \
@@ -22,7 +22,7 @@ ENV TOMCAT_MAJOR=9 \
     JAVA_OPTS='-Xmx3000m' \
 #tomcat \
     CATALINA_HOME=/usr/local/tomcat
-ENV TOMCAT_TGZ_URL=https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
+ENV TOMCAT_TGZ_URL=https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
     PATH=$CATALINA_HOME/bin:$JAVA_HOME/bin:$PATH \
 #shib-idp \
     SHIB_RELDIR=http://shibboleth.net/downloads/identity-provider/$VERSION \
diff --git a/container_files/idp/idp.installer.properties b/container_files/idp/idp.installer.properties
index 2454fb6..c973305 100644
--- a/container_files/idp/idp.installer.properties
+++ b/container_files/idp/idp.installer.properties
@@ -1,4 +1,4 @@
-idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-4.1.0
+idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-4.1.2
 idp.target.dir=/opt/shibboleth-idp
 idp.host.name=idp.example.org
 idp.sealer.password=changeit