Skip to content

Commit

Permalink
tweak idp ver test
Browse files Browse the repository at this point in the history
  • Loading branch information
pcaskey committed Dec 10, 2021
1 parent dc785a4 commit ad16bd1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/; \
Expand Down
2 changes: 1 addition & 1 deletion tests/checkidpver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ad16bd1

Please sign in to comment.