From 6c9f7712810cc0164ccdd9d8fab9c033108b74a9 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Fri, 29 May 2020 20:56:04 +0000
Subject: [PATCH 1/2] fix propagation of env vars downstream

---
 Dockerfile                        | 2 +-
 container_files/system/startup.sh | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8aad662..ecda6ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV TOMCAT_MAJOR=9 \
 ##shib-idp \
     VERSION=4.0.0 \
 ##TIER \
-    TIERVERSION=20200518 \
+    TIERVERSION=20200529 \
 #################### \
 #### OTHER VARS #### \
 #################### \
diff --git a/container_files/system/startup.sh b/container_files/system/startup.sh
index 7b3e33c..7554946 100644
--- a/container_files/system/startup.sh
+++ b/container_files/system/startup.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+#set env vars for cron jobs
+#  this script creates /opt/tier/env.bash which is sourced by the cron jobs' scripts
+/opt/tier/setenv.sh
+
 #for passed-in env vars, remove spaces and replace any ; with : in usertoken env var since we will use ; as a delimiter
 export USERTOKEN="${USERTOKEN//;/:}"
 export USERTOKEN="${USERTOKEN// /}"

From 85c65401ef9852bf9d64b823528cd49aebf2d4e4 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Wed, 3 Jun 2020 16:29:18 +0000
Subject: [PATCH 2/2] bump IdP to 4.0.1

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

diff --git a/Dockerfile b/Dockerfile
index ecda6ac..99d4318 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,9 +8,9 @@ FROM centos:centos7
 ENV TOMCAT_MAJOR=9 \
     TOMCAT_VERSION=9.0.35 \
 ##shib-idp \
-    VERSION=4.0.0 \
+    VERSION=4.0.1 \
 ##TIER \
-    TIERVERSION=20200529 \
+    TIERVERSION=20200603 \
 #################### \
 #### OTHER VARS #### \
 #################### \
diff --git a/container_files/idp/idp.installer.properties b/container_files/idp/idp.installer.properties
index ace3ea1..45f454b 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.0.0
+idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-4.0.1
 idp.target.dir=/opt/shibboleth-idp
 idp.host.name=idp.example.org
 idp.sealer.password=changeit