diff --git a/Dockerfile b/Dockerfile index d84fe12..410abb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,8 @@ LABEL author="tier-packaging@internet2.edu " \ ARG GROUPER_CONTAINER_VERSION -ENV GROUPER_VERSION=4.5.5 \ - GROUPER_CONTAINER_VERSION=4.5.5 \ +ENV GROUPER_VERSION=4.6.0 \ + GROUPER_CONTAINER_VERSION=4.6.0 \ JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto \ PATH=$PATH:$JAVA_HOME/bin \ GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF diff --git a/container_files/tomcat/bin/setenv.sh b/container_files/tomcat/bin/setenv.sh index cc7c73a..87d4539 100755 --- a/container_files/tomcat/bin/setenv.sh +++ b/container_files/tomcat/bin/setenv.sh @@ -3,5 +3,5 @@ GROUPER_ADD_OPENS="--add-opens java.base/java.lang=ALL-UNNAMED \ --add-opens java.base/java.util=ALL-UNNAMED \ --add-opens java.sql/java.sql=ALL-UNNAMED" #JAVA_OPTS="-Dlog4j.configurationFile=/opt/tomcat/conf/log4j2.xml -DENV=$ENV -DUSERTOKEN=$USERTOKEN" -CATALINA_OPTS="-Xmx$GROUPER_MAX_MEMORY -XX:+UseG1GC -XX:+UseStringDeduplication -Dlog4j.configurationFile=/opt/tomcat/conf/log4j2.xml -DENV='$ENV' -DUSERTOKEN='$USERTOKEN' -Dfile.encoding=UTF-8 -Djavax.net.ssl.trustStore=/etc/pki/java/cacerts $GROUPER_ADD_OPENS $GROUPER_EXTRA_CATALINA_OPTS" +CATALINA_OPTS="-Xmx$GROUPER_MAX_MEMORY -XX:+UseG1GC -XX:+UseStringDeduplication -Dlog4j.configurationFile=/opt/tomcat/conf/log4j2.xml -DENV='$ENV' -DUSERTOKEN='$USERTOKEN' -Dfile.encoding=UTF-8 $GROUPER_ADD_OPENS $GROUPER_EXTRA_CATALINA_OPTS" LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager diff --git a/container_files/usr-local-bin/libraryPrep.sh b/container_files/usr-local-bin/libraryPrep.sh index b97884e..0237a2a 100644 --- a/container_files/usr-local-bin/libraryPrep.sh +++ b/container_files/usr-local-bin/libraryPrep.sh @@ -394,11 +394,6 @@ prep_finishBegin() { echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_APACHE_STATUS_PATH=/status_grouper/status" export GROUPER_APACHE_STATUS_PATH=/status_grouper/status fi - - if [ -z "$GROUPER_GSH_JVMARGS" ] ; then - echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_GSH_JVMARGS=\"-Djavax.net.ssl.trustStore=/etc/pki/java/cacerts\"" - export GROUPER_GSH_JVMARGS="-Djavax.net.ssl.trustStore=/etc/pki/java/cacerts" - fi #Replace web.xml session timeout with env variable if [[ -z "$GROUPER_TOMCAT_SESSION_TIMEOUT_MINUTES" ]]; then