diff --git a/Dockerfile b/Dockerfile index 80f903a..bf07710 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,15 @@ 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.11.0/log4j-core-2.11.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/ +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/ +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