diff --git a/Dockerfile b/Dockerfile index 80f903a..f3bf1e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,11 +6,11 @@ FROM centos:centos7 # ##tomcat \ ENV TOMCAT_MAJOR=9 \ - TOMCAT_VERSION=9.0.50 \ + TOMCAT_VERSION=9.0.56 \ ##shib-idp \ VERSION=4.1.4 \ ##TIER \ - TIERVERSION=20210802 \ + TIERVERSION=20211210 \ #################### \ #### OTHER VARS #### \ #################### \ @@ -160,9 +160,13 @@ ADD container_files/idp/idp.xml /usr/local/tomcat/conf/Catalina/idp.xml ADD container_files/tomcat/server.xml /usr/local/tomcat/conf/server.xml #use log4j for tomcat logging -ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /usr/local/tomcat/bin/ -ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /usr/local/tomcat/bin/ -ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /usr/local/tomcat/bin/ +#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.15.0/log4j-core-2.15.0.jar /usr/local/tomcat/bin/ +COPY container_files/tomcat/log4j-core-2.15.0.jar /usr/local/tomcat/bin/ +#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.15.0/log4j-api-2.15.0.jar /usr/local/tomcat/bin/ +COPY container_files/tomcat/log4j-api-2.15.0.jar /usr/local/tomcat/bin/ +#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.15.0/log4j-jul-2.15.0.jar /usr/local/tomcat/bin/ +COPY container_files/tomcat/log4j-jul-2.15.0.jar /usr/local/tomcat/bin/ + RUN cd /usr/local/tomcat/; \ chmod +r bin/log4j-*.jar; ADD container_files/tomcat/log4j2.xml /usr/local/tomcat/conf/ diff --git a/container_files/tomcat/log4j-api-2.15.0.jar b/container_files/tomcat/log4j-api-2.15.0.jar new file mode 100644 index 0000000..a662571 Binary files /dev/null and b/container_files/tomcat/log4j-api-2.15.0.jar differ diff --git a/container_files/tomcat/log4j-core-2.15.0.jar b/container_files/tomcat/log4j-core-2.15.0.jar new file mode 100644 index 0000000..f7e14b8 Binary files /dev/null and b/container_files/tomcat/log4j-core-2.15.0.jar differ diff --git a/container_files/tomcat/log4j-jul-2.15.0.jar b/container_files/tomcat/log4j-jul-2.15.0.jar new file mode 100644 index 0000000..99ef096 Binary files /dev/null and b/container_files/tomcat/log4j-jul-2.15.0.jar differ diff --git a/tests/checkidpver.sh b/tests/checkidpver.sh index d9fea87..ea09da2 100755 --- a/tests/checkidpver.sh +++ b/tests/checkidpver.sh @@ -23,8 +23,8 @@ if [ $? == '0' ]; then if [ $? -ne '0' ]; then docker run -d $1 &>/dev/null launchflag="yes" - echo 'launching container (will take about a minute)...' - sleep 60 + echo 'launching container (will take about 2 minutes)...' + sleep 120 fi #get container ID @@ -34,6 +34,8 @@ if [ $? == '0' ]; then echo "Specified container does not appear to be running... Terminating." echo "" exit 1 + else + echo "Container is running at id: $contid" fi #get version from running status page inside container @@ -47,10 +49,12 @@ if [ -z "$(echo $shibver | xargs)" ]; then echo "Unable to determine version from a running instance... Terminating." echo "" exit 1 +else + echo "Running shibb version is: $shibver" fi #check if that version is available in the 'latest' download area (return is 0 if current, non-zero if not current) -wget -q --spider https://shibboleth.net/downloads/identity-provider/latest/shibboleth-identity-provider-${shibver}.tar.gz +wget --no-check-certificate --spider https://shibboleth.net/downloads/identity-provider/latest/shibboleth-identity-provider-${shibver}.tar.gz if [ $? == '0' ]; then echo "Running IdP version (${shibver}) is current!"