Skip to content

log4j, tomcat, java updates #99

merged 4 commits into from Dec 10, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Next Next commit
update log4j, tomcat
pcaskey committed Dec 10, 2021
commit dc785a437bcd793143f0f55eb477ebd3ec68040c
16 changes: 11 additions & 5 deletions 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/
Binary file added container_files/tomcat/log4j-api-2.15.0.jar
Binary file not shown.
Binary file added container_files/tomcat/log4j-core-2.15.0.jar
Binary file not shown.
Binary file added container_files/tomcat/log4j-jul-2.15.0.jar
Binary file not shown.