Merge pull request #132 from docker/4.3.1_20240125

update tomcat version/keys URL

Dockerfile

@@ -6,11 +6,11 @@ FROM centos:centos7
 #
 ##tomcat \
 ENV TOMCAT_MAJOR=9 \
-    TOMCAT_VERSION=9.0.84 \
+    TOMCAT_VERSION=9.0.85 \
 ##shib-idp \
     VERSION=4.3.1 \
 ##TIER \
-    TIERVERSION=20231218 \
+    TIERVERSION=20240125 \
 #################### \
 #### OTHER VARS #### \
 #################### \
@@ -144,7 +144,7 @@ RUN mkdir -p /tmp/shibboleth && cd /tmp/shibboleth && \
 RUN mkdir -p "$CATALINA_HOME" && set -x \
 	&& wget -q -O $CATALINA_HOME/tomcat.tar.gz "$TOMCAT_TGZ_URL" \
 	&& wget -q -O $CATALINA_HOME/tomcat.tar.gz.asc "$TOMCAT_TGZ_URL.asc" \
-	&& wget -q -O $CATALINA_HOME/KEYS "https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS" \
+	&& wget -q -O $CATALINA_HOME/KEYS "https://downloads.apache.org/tomcat/tomcat-$TOMCAT_MAJOR/KEYS" \
     && gpg --import $CATALINA_HOME/KEYS \
     && gpg $CATALINA_HOME/tomcat.tar.gz.asc \
 	&& gpg --batch --verify $CATALINA_HOME/tomcat.tar.gz.asc $CATALINA_HOME/tomcat.tar.gz \