diff --git a/Dockerfile b/Dockerfile index 86a094a..923a0c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -144,7 +144,7 @@ ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/l ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /usr/local/tomcat/bin/ ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /usr/local/tomcat/bin/ RUN cd /usr/local/tomcat/; \ - chmod +r bin/log4j-*.jar; \ + chmod +r bin/log4j-*.jar; ADD container_files/tomcat/log4j2.xml /usr/local/tomcat/conf/ ADD container_files/tomcat/setenv.sh /usr/local/tomcat/bin/ diff --git a/container_files/system/startup.sh b/container_files/system/startup.sh index 19eecc1..b480037 100644 --- a/container_files/system/startup.sh +++ b/container_files/system/startup.sh @@ -6,6 +6,9 @@ export USERTOKEN="${USERTOKEN// /}" export ENV="${ENV//;/:}" export ENV="${ENV// /}" +#rebuild idp war file to incorporate any post-install additions +/opt/shibboleth-idp/bin/build.sh -q -Didp.target.dir=/opt/shibboleth-idp + # generic console logging pipe for anyone mkfifo -m 666 /tmp/logpipe cat <> /tmp/logpipe 1>&2 &