diff --git a/Dockerfile b/Dockerfile index 75c994f..3993810 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,8 @@ LABEL author="tier-packaging@internet2.edu " \ ARG GROUPER_CONTAINER_VERSION -ENV GROUPER_VERSION=5.7.0 \ - GROUPER_CONTAINER_VERSION=5.7.0 \ +ENV GROUPER_VERSION=5.7.1 \ + GROUPER_CONTAINER_VERSION=5.7.1 \ 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 2411f27..e1ca51e 100755 --- a/container_files/tomcat/bin/setenv.sh +++ b/container_files/tomcat/bin/setenv.sh @@ -1,7 +1,7 @@ CLASSPATH=/opt/tomcat/bin/* GROUPER_ADD_OPENS="--add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED \ - --add-opens java.base/java.util=ALL-UNNAMED \ - --add-opens java.sql/java.sql=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 $GROUPER_ADD_OPENS $GROUPER_EXTRA_CATALINA_OPTS" LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager