From 2556dfffe40d1b6321a81fa5e181b65080b830ee Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Tue, 17 May 2022 17:48:32 +0000
Subject: [PATCH 1/2] bump tomcat to 9.0.63

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8cf86f8..85f5e5d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,11 +6,11 @@ FROM centos:centos7
 #
 ##tomcat \
 ENV TOMCAT_MAJOR=9 \
-    TOMCAT_VERSION=9.0.62 \
+    TOMCAT_VERSION=9.0.63 \
 ##shib-idp \
     VERSION=4.2.1 \
 ##TIER \
-    TIERVERSION=20220418 \
+    TIERVERSION=20220517 \
 #################### \
 #### OTHER VARS #### \
 #################### \

From 22c50c9aeba3c0bd4aba8a2c930d27ede58c5433 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Fri, 24 Jun 2022 15:55:05 +0000
Subject: [PATCH 2/2] bump tomcat, add exec to supervisord launch

---
 Dockerfile                        | 4 ++--
 container_files/system/startup.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 85f5e5d..57531eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,11 +6,11 @@ FROM centos:centos7
 #
 ##tomcat \
 ENV TOMCAT_MAJOR=9 \
-    TOMCAT_VERSION=9.0.63 \
+    TOMCAT_VERSION=9.0.64 \
 ##shib-idp \
     VERSION=4.2.1 \
 ##TIER \
-    TIERVERSION=20220517 \
+    TIERVERSION=20220624 \
 #################### \
 #### OTHER VARS #### \
 #################### \
diff --git a/container_files/system/startup.sh b/container_files/system/startup.sh
index 7554946..82cc28b 100644
--- a/container_files/system/startup.sh
+++ b/container_files/system/startup.sh
@@ -60,4 +60,4 @@ sed -i -e '/<rollingPolicy/,/<\/rollingPolicy>/d' ${IDP_LOG_CFG_FILE}
 
 
 #launch supervisord
-/usr/bin/supervisord -c /etc/supervisor/supervisord.conf
+exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf