2.6.14

Dockerfile

@@ -6,7 +6,7 @@ RUN yum update -y \
 RUN yum install -y wget tar unzip dos2unix patch
 
 ARG GROUPER_CONTAINER_VERSION
-ENV GROUPER_VERSION=2.6.13 \
+ENV GROUPER_VERSION=2.6.14 \
      GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
 
 # Install Corretto Java JDK
@@ -32,7 +32,7 @@ RUN echo 'Installing Grouper'; \
     cd /opt/grouper/$GROUPER_VERSION/ \
     && $JAVA_HOME/bin/java -cp :grouperInstaller.jar edu.internet2.middleware.grouperInstaller.GrouperInstaller
 FROM centos:centos7 as cleanup
-ENV GROUPER_VERSION=2.6.13 \
+ENV GROUPER_VERSION=2.6.14 \
     TOMEE_VERSION=7.0.0
 RUN mkdir -p /opt/grouper/grouperWebapp/
 RUN mkdir -p /opt/tomee/
@@ -101,8 +101,8 @@ COPY container_files/tier-support/log4j_fix/tomeeLib/slf4j-* /opt/tomee/lib/
 RUN rm -f /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-api-*
 COPY container_files/tier-support/log4j_fix/webinfLib/* /opt/grouper/grouperWebapp/WEB-INF/lib/
 COPY container_files/certs/* /opt/grouper/certs/
-RUN rm -f /opt/grouper/grouperWebapp/WEB-INF/grouperUi2/index/index.jsp
-COPY container_files/index.jsp /opt/grouper/grouperWebapp/WEB-INF/grouperUi2/index/
+#RUN rm -f /opt/grouper/grouperWebapp/WEB-INF/grouperUi2/index/index.jsp
+#COPY container_files/index.jsp /opt/grouper/grouperWebapp/WEB-INF/grouperUi2/index/
 
 # this is to improve openshift
 RUN touch /opt/grouper/grouperEnv.sh \

container_files/usr-local-bin/librarySetupFiles.sh

@@ -48,23 +48,19 @@ setupFiles_localLogging() {
     echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i \"s|__LOGPIPE__||g\" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $?"
   fi
 
-  if [ -f /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.additionalLoggers.xml.txt ]; then
-    additionalLoggersFile=`cat /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.additionalLoggers.xml.txt`
-    # replace quote, but then double escape the result for some reason.  this replaces quote with slash quote
-    additionalLoggersFile="$(sed s/\"/\\\\\\\"/g <<<$additionalLoggersFile)"
-    sed -i "s|<!--MORELOGGERS-->|$additionalLoggersFile|g" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
+  additionalLoggersFile=/opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.additionalLoggers.xml.txt
+  if [ -f $additionalLoggersFile ]; then
+    sed -i "/<!--MORELOGGERS-->/r $additionalLoggersFile" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
     returnCode=$?
-    echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i \"s|<!--MORELOGGERS-->|$additionalLoggersFile|g\" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $returnCode"
+    echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i '/<!--MORELOGGERS-->/r $additionalLoggersFile' /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $returnCode"
     if [ $returnCode != 0 ]; then exit $returnCode; fi
   fi
 
-  if [ -f /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.additionalAppenders.xml.txt ]; then
-    additionalAppendersFile=`cat /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.additionalAppenders.xml.txt`
-    # replace quote, but then double escape the result for some reason.  this replaces quote with slash quote
-    additionalAppendersFile="$(sed s/\"/\\\\\\\"/g <<<$additionalAppendersFile)"
-    sed -i "s|<!--MOREAPPENDERS-->|$additionalAppendersFile|g" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
+  additionalAppendersFile=/opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.additionalAppenders.xml.txt
+  if [ -f $additionalAppendersFile ]; then
+    sed -i "/<!--MOREAPPENDERS-->/r $additionalAppendersFile" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
     returnCode=$?
-    echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i \"s|<!--MOREAPPENDERS-->|$additionalAppendersFile|g\" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $returnCode"
+    echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i '/<!--MOREAPPENDERS-->/r $additionalAppendersFile' /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $returnCode"
     if [ $returnCode != 0 ]; then exit $returnCode; fi
   fi
 
@@ -82,9 +78,9 @@ setupFiles_chownDirs() {
     # do this last
     if [ "$GROUPER_CHOWN_DIRS" = "true" ]
       then
-        chown -R tomcat:tomcat /opt/grouper/grouperWebapp /opt/tomee
+        chown tomcat:tomcat $(find /opt/grouper/grouperWebapp /opt/tomee ! -user tomcat -o -group tomcat -print)
         returnCode=$?
-        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_chownDirs) chown -R tomcat:tomcat /opt/grouper/grouperWebapp /opt/tomee, result: $returnCode"
+        echo “grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_chownDirs) chown -R tomcat:tomcat inside find /opt/grouper/grouperWebapp /opt/tomee, result: $returnCode”
         # dont fail on chown
         #if [ $returnCode != 0 ]; then exit $returnCode; fi
     fi