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
Prev Previous commit
Next Next commit
tweak idp ver test
pcaskey committed Dec 10, 2021
commit ad16bd15d03c67691f1d8f06e269d55caace9bcf
8 changes: 3 additions & 5 deletions 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/; \
2 changes: 1 addition & 1 deletion 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