Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Prevent log4j config errors during image build (commit 2)
credman committed May 7, 2022
1 parent 523e322 commit 8577694
Showing 5 changed files with 82 additions and 6 deletions.
2 changes: 0 additions & 2 deletions base/Dockerfile
@@ -62,8 +62,6 @@ RUN (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
(mysqld_safe & ) \
&& while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 3; done; \
cd /opt/grouper/grouperWebapp/WEB-INF/bin \
&& . /usr/local/bin/library.sh \
&& setupFiles_localLogging \
&& ./gsh.sh -registry -check -runscript -noprompt \
&& ./gsh.sh /seed-data/bootstrap.gsh \
&& pkill -HUP slapd \
79 changes: 79 additions & 0 deletions base/container_files/conf/log4j2.xml
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<Configuration status="info">
<Properties>
<Property name="layout">%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n</Property>
</Properties>
<Appenders>
<File name="CATALINA" fileName="/tmp/logpipe">
<PatternLayout pattern="tomee;catalina.out;${env:ENV};${env:USERTOKEN};${layout}"/>
</File>
<Console name="stderr" target="SYSTEM_ERR">
<PatternLayout pattern="grouper;${ENV};${USERTOKEN};${layout}"/>
</Console>
<File name="grouper_error" fileName="/tmp/logpipe">
<PatternLayout pattern="grouper;grouper_error.log;${ENV};${USERTOKEN};${layout}"/>
</File>
<File name="grouper_daemon" fileName="/tmp/logpipe">
<PatternLayout pattern="grouper;grouperDaemon.log;${ENV};${USERTOKEN};${layout}"/>
</File>
<File name="grouper_pspng" fileName="/tmp/logpipe">
<PatternLayout pattern="grouper;pspng.log;${ENV};${USERTOKEN};${layout}"/>
</File>
<File name="grouper_provisioning" fileName="/tmp/logpipe">
<PatternLayout pattern="grouper;provisioning.log;${ENV};${USERTOKEN};${layout}"/>
</File>
<File name="grouper_ws" fileName="/tmp/logpipe">
<PatternLayout pattern="grouper;grouper_ws.log;${ENV};${USERTOKEN};${layout}"/>
</File>
<File name="grouper_ws_longRunning" fileName="/tmp/logpipe">
<PatternLayout pattern="grouper;grouper_ws_longRunning.log;${ENV};${USERTOKEN};${layout}"/>
</File>
</Appenders>

<Loggers>
<Root level="error">
<AppenderRef ref="grouper_error"/>
</Root>
<Logger name="org.apache.catalina" level="info" additivity="false">
<AppenderRef ref="CATALINA"/>
</Logger>
<Logger name="edu.internet2.middleware" level="warn" additivity="false">
<AppenderRef ref="grouper_error"/>
</Logger>
<Logger name="edu.internet2.middleware.grouper.app.loader.GrouperLoaderLog" level="debug" additivity="false">
<AppenderRef ref="grouper_daemon"/>
</Logger>
<Logger name="edu.internet2.middleware.grouper.pspng" level="info" additivity="false">
<AppenderRef ref="grouper_pspng"/>
</Logger>
<Logger name="edu.internet2.middleware.grouper.app.provisioning.GrouperProvisioningObjectLog" level="debug" additivity="false">
<AppenderRef ref="grouper_provisioning"/>
</Logger>
<Logger name="edu.internet2.middleware.grouper.app.syncToGrouper.SyncToGrouperFromSqlDaemon" level="debug" additivity="false">
<AppenderRef ref="grouper_error"/>
</Logger>
<Logger name="edu.internet2.middleware.grouper.app.provisioning.GrouperProvisioningLogCommands" level="debug" additivity="false">
<AppenderRef ref="grouper_error"/>
</Logger>
<Logger name="edu.internet2.middleware.grouper.stem.StemViewPrivilegeEsbListener" level="debug" additivity="false">
<AppenderRef ref="grouper_error"/>
</Logger>
<Logger name="edu.internet2.middleware.grouper.stem.StemViewPrivilegeFullDaemonLogic" level="debug" additivity="false">
<AppenderRef ref="grouper_error"/>
</Logger>
<Logger name="org.apache.tools.ant" level="warn" additivity="false">
<AppenderRef ref="grouper_error"/>
</Logger>
<Logger name="edu.internet2.middleware.grouper.util.PerformanceLogger" level="info" additivity="false">
<AppenderRef ref="grouper_error"/>
</Logger>

<Logger name="edu.internet2.middleware.grouper.ws.util.GrouperWsLog" level="off" additivity="false">
<AppenderRef ref="grouper_ws"/>
</Logger>
<Logger name="edu.internet2.middleware.grouper.ws.util.GrouperWsLongRunningLog" level="off" additivity="false">
<AppenderRef ref="grouper_ws_longRunning"/>
</Logger>

</Loggers>
</Configuration>
2 changes: 1 addition & 1 deletion ex101/ex101.1.1/Dockerfile
@@ -17,7 +17,7 @@ COPY container_files/seed-data/ /seed-data/
# && setupFiles; \

RUN . /usr/local/bin/library.sh \
&& prep_conf && setupFiles_localLogging && prep_finish; \
&& prep_conf && prep_finish; \
(/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
&& while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
(mysqld_safe & ) \
3 changes: 1 addition & 2 deletions ex201/ex201.end/Dockerfile
@@ -16,7 +16,7 @@ COPY container_files/seed-data/ /seed-data/

# && setupFiles
RUN . /usr/local/bin/library.sh \
&& prep_conf && . /usr/local/bin/library.sh && setupFiles_localLogging && prep_finish; \
&& prep_conf && prep_finish; \
(/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
&& while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
(mysqld_safe & ) \
@@ -25,7 +25,6 @@ RUN . /usr/local/bin/library.sh \
&& ldapadd -x -D cn=root,dc=internet2,dc=edu -w password -f /seed-data/users.ldif \
&& mysql grouper < /seed-data/sisData.sql \
&& if [ ! -f /usr/local/bin/java ]; then ln -s /usr/lib/jvm/java-1.8.0-amazon-corretto/bin/java /usr/local/bin/java; fi \
&& chmod a+rw /opt/grouper/logs/*.log \
&& sudo --preserve-env=PATH -u tomcat bin/gsh.sh /seed-data/bootstrap.gsh \
&& pkill -HUP slapd \
&& while curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to stop; sleep 1; done; \
2 changes: 1 addition & 1 deletion ex401/ex401.end/Dockerfile
@@ -16,7 +16,7 @@ COPY container_files/seed-data/ /seed-data/

# && setupFiles
RUN . /usr/local/bin/library.sh \
&& prep_conf && setupFiles_localLogging && prep_finish; \
&& prep_conf && prep_finish; \
(/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
&& while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
(mysqld_safe & ) \

0 comments on commit 8577694

Please sign in to comment.