From ad16bd15d03c67691f1d8f06e269d55caace9bcf Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Fri, 10 Dec 2021 17:39:42 +0000 Subject: [PATCH] tweak idp ver test --- Dockerfile | 8 +++----- tests/checkidpver.sh | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index bf07710..f3bf1e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -160,13 +160,11 @@ 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-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.11.0/log4j-api-2.11.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.11.0/log4j-jul-2.11.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/; \ diff --git a/tests/checkidpver.sh b/tests/checkidpver.sh index d9fea87..1610522 100755 --- a/tests/checkidpver.sh +++ b/tests/checkidpver.sh @@ -24,7 +24,7 @@ if [ $? == '0' ]; then docker run -d $1 &>/dev/null launchflag="yes" echo 'launching container (will take about a minute)...' - sleep 60 + sleep 80 fi #get container ID