From b854c1438fb8f7ca9fcaf8734539e8ed5643d360 Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Wed, 20 Jul 2022 09:49:20 -0400 Subject: [PATCH] 2.6.10 --- Dockerfile | 4 ++-- container_files/tomee/bin/setenv.sh | 2 +- .../usr-local-bin/librarySetupFilesForComponent.sh | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e081bf2d..fa0b35fa 100644 --- a/Dockerfile +++ b/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.9 \ +ENV GROUPER_VERSION=2.6.10 \ 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.9 \ +ENV GROUPER_VERSION=2.6.10 \ TOMEE_VERSION=7.0.0 RUN mkdir -p /opt/grouper/grouperWebapp/ RUN mkdir -p /opt/tomee/ diff --git a/container_files/tomee/bin/setenv.sh b/container_files/tomee/bin/setenv.sh index 174be1c5..bf08bddf 100755 --- a/container_files/tomee/bin/setenv.sh +++ b/container_files/tomee/bin/setenv.sh @@ -1,4 +1,4 @@ CLASSPATH=/opt/tomee/bin/* #JAVA_OPTS="-Dlog4j.configurationFile=/opt/tomee/conf/log4j2.xml -DENV=$ENV -DUSERTOKEN=$USERTOKEN" -CATALINA_OPTS="-Xmx$GROUPER_MAX_MEMORY -XX:+UseG1GC -XX:+UseStringDeduplication -Dlog4j.configurationFile=/opt/tomee/conf/log4j2.xml -DENV=$ENV -DUSERTOKEN=$USERTOKEN -Dfile.encoding=UTF-8 -Djavax.net.ssl.trustStore=/etc/pki/java/cacerts $GROUPER_EXTRA_CATALINA_OPTS" +CATALINA_OPTS="-Xmx$GROUPER_MAX_MEMORY -XX:+UseG1GC -XX:+UseStringDeduplication -Dlog4j.configurationFile=/opt/tomee/conf/log4j2.xml -DENV='$ENV' -DUSERTOKEN='$USERTOKEN' -Dfile.encoding=UTF-8 -Djavax.net.ssl.trustStore=/etc/pki/java/cacerts $GROUPER_EXTRA_CATALINA_OPTS" LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager diff --git a/container_files/usr-local-bin/librarySetupFilesForComponent.sh b/container_files/usr-local-bin/librarySetupFilesForComponent.sh index 63fb95db..e41f37a0 100644 --- a/container_files/usr-local-bin/librarySetupFilesForComponent.sh +++ b/container_files/usr-local-bin/librarySetupFilesForComponent.sh @@ -5,7 +5,7 @@ setupFilesForComponent_ws() { # copy files to their appropriate locations based on passed in flags if [ "$GROUPER_WS" = "true" ] then - cp -r /opt/grouper/grouperWebapp/WEB-INF/libWs/* /opt/grouper/grouperWebapp/WEB-INF/lib/ + cp -ra /opt/grouper/grouperWebapp/WEB-INF/libWs/* /opt/grouper/grouperWebapp/WEB-INF/lib/ returnCode=$? echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ws) cp -r /opt/grouper/grouperWebapp/WEB-INF/libWs/* /opt/grouper/grouperWebapp/WEB-INF/lib/ , result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi @@ -17,7 +17,7 @@ setupFilesForComponent_scim() { if [ "$GROUPER_SCIM" = "true" ] then - cp -r /opt/grouper/grouperWebapp/WEB-INF/libScim/* /opt/grouper/grouperWebapp/WEB-INF/lib/ + cp -ra /opt/grouper/grouperWebapp/WEB-INF/libScim/* /opt/grouper/grouperWebapp/WEB-INF/lib/ returnCode=$? echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_scim) cp -r /opt/grouper/grouperWebapp/WEB-INF/libScim/* /opt/grouper/grouperWebapp/WEB-INF/lib/ , result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi @@ -29,7 +29,7 @@ setupFilesForComponent_ui() { if [ "$GROUPER_UI" = "true" ] || [ "$GROUPER_DAEMON" = "true" ] then - cp -r /opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/* /opt/grouper/grouperWebapp/WEB-INF/lib/ + cp -ra /opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/* /opt/grouper/grouperWebapp/WEB-INF/lib/ returnCode=$? echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ui) cp -r /opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/* /opt/grouper/grouperWebapp/WEB-INF/lib/ , result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi