From 0d15a26e45d0ee56e810446f60be2a8c0d54df3c Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 1 Feb 2021 20:56:34 +0000 Subject: [PATCH 1/2] bump tomcat to 9.0.41 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e9a7e22..abf0197 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,11 +6,11 @@ FROM centos:centos7 # ##tomcat \ ENV TOMCAT_MAJOR=9 \ - TOMCAT_VERSION=9.0.40 \ + TOMCAT_VERSION=9.0.41 \ ##shib-idp \ VERSION=4.0.1 \ ##TIER \ - TIERVERSION=20201130 \ + TIERVERSION=20210201 \ #################### \ #### OTHER VARS #### \ #################### \ From 4f2953ef18034c146edb8f14687408dbc39a3ccf Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 1 Feb 2021 21:10:42 +0000 Subject: [PATCH 2/2] fix tomcat test --- tests/checktomcatver.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/checktomcatver.sh b/tests/checktomcatver.sh index e2c1459..3c1abd0 100755 --- a/tests/checktomcatver.sh +++ b/tests/checktomcatver.sh @@ -51,7 +51,8 @@ if [ -z "$(echo $tomcatver | xargs)" ]; then fi #check if that version of tomcat is available in the download area (return is 0 if current, non-zero if not current) -wget -q --spider http://apache.mirrors.ionfish.org/tomcat/tomcat-9/v${tomcatver}/bin/apache-tomcat-${tomcatver}.tar.gz +wget -q --spider https://mirrors.gigenet.com/apache/tomcat/tomcat-9/v${tomcatver}/bin/apache-tomcat-${tomcatver}.tar.gz +#wget -q --spider http://apache.mirrors.ionfish.org/tomcat/tomcat-9/v${tomcatver}/bin/apache-tomcat-${tomcatver}.tar.gz if [ $? == '0' ]; then echo "Running Tomcat version (${tomcatver}) is current!"