Prevent log4j config errors during image build

docker · May 6, 2022 · 523e322 · 523e322
1 parent a12eb32
commit 523e322
Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -62,6 +62,8 @@ 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 \

diff --git a/base/container_files/conf/log4j.properties → ...onf/log4j.grouperContainerHost.properties b/base/container_files/conf/log4j.properties → ...onf/log4j.grouperContainerHost.properties
diff --git a/ex101/ex101.1.1/Dockerfile b/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 && prep_finish; \
+    && prep_conf && setupFiles_localLogging && 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 & ) \

diff --git a/ex201/ex201.end/Dockerfile b/ex201/ex201.end/Dockerfile
@@ -16,7 +16,7 @@ COPY container_files/seed-data/ /seed-data/
 
 #  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish; \
+    && prep_conf && . /usr/local/bin/library.sh && setupFiles_localLogging && 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,6 +25,7 @@ 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; \

diff --git a/ex401/ex401.end/Dockerfile b/ex401/ex401.end/Dockerfile
@@ -16,7 +16,7 @@ COPY container_files/seed-data/ /seed-data/
 
 #  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish; \
+    && prep_conf && setupFiles_localLogging && 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 & ) \