From 4093e84f8d0dd22bcea39b257969a029a042ade1 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Wed, 1 Aug 2018 15:53:53 -0400
Subject: [PATCH] update tomcat memory settings

---
 Dockerfile                       | 18 +++++++++---------
 container_files/tomcat/setenv.sh |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 255043a..94e00b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,17 +4,13 @@ FROM centos:centos7
 ### VERSION SETTINGS ###
 ########################
 #
-##java
-ENV JAVA_VERSION=8u171 \
-    BUILD_VERSION=b11 \
-    JAVA_BUNDLE_ID=512cd62ec5174c3487ac17c61aaa89e8 \
 ##tomcat \
-    TOMCAT_MAJOR=9 \
+ENV TOMCAT_MAJOR=9 \
     TOMCAT_VERSION=9.0.10 \
 ##shib-idp \
     VERSION=3.3.3 \
 ##TIER \
-    TIERVERSION=180701 \
+    TIERVERSION=180801 \
 ################## \
 ### OTHER VARS ### \
 ################## \
@@ -24,7 +20,7 @@ ENV JAVA_VERSION=8u171 \
     MAINTAINER=tier \
 #java \
     JAVA_HOME=/usr \
-    JAVA_OPTS='-Xmx3000m -XX:MaxPermSize=256m' \
+    JAVA_OPTS='-Xmx3000m' \
 #tomcat \
     CATALINA_HOME=/usr/local/tomcat
 ENV TOMCAT_TGZ_URL=https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
@@ -36,7 +32,6 @@ ENV TOMCAT_TGZ_URL=https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOM
 ENV ENV=dev \
     USERTOKEN=nothing
 
-
 #set labels
 LABEL Vendor="Internet2" \
       ImageType="Shibboleth IDP Release" \
@@ -83,7 +78,12 @@ RUN curl -o /tmp/ZuluJCEPolicies.zip https://cdn.azul.com/zcek/bin/ZuluJCEPolici
 	&& unzip -oj ZuluJCEPolicies.zip ZuluJCEPolicies/US_export_policy.jar -d $JAVA_HOME/lib/jvm/zulu-8/jre/lib/security/ \
 	&& rm -rf /tmp/ZuluJCEPolicies.zip
 
-# To use Oracle java/JCE
+
+# To use Oracle java/JCE:
+#
+#ENV JAVA_VERSION=8u171 \
+#    BUILD_VERSION=b11 \
+#    JAVA_BUNDLE_ID=512cd62ec5174c3487ac17c61aaa89e8 \
 #
 # Uncomment the following commands to download the Oracle JDK to your Shibboleth IDP image.  
 #     ==> By uncommenting these next 6 lines, you agree to the Oracle Binary Code License Agreement for Java SE (http://www.oracle.com/technetwork/java/javase/terms/license/index.html)
diff --git a/container_files/tomcat/setenv.sh b/container_files/tomcat/setenv.sh
index adf08bf..5424db3 100644
--- a/container_files/tomcat/setenv.sh
+++ b/container_files/tomcat/setenv.sh
@@ -1,4 +1,5 @@
 CLASSPATH=/usr/local/tomcat/bin/*
-JAVA_OPTS="-Dlog4j.configurationFile=/usr/local/tomcat/conf/log4j2.xml -DENV=$ENV -DUSERTOKEN=$USERTOKEN"
+JAVA_OPTS="$JAVA_OPTS -Dlog4j.configurationFile=/usr/local/tomcat/conf/log4j2.xml -DENV=$ENV -DUSERTOKEN=$USERTOKEN"
 LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
+CATALINA_OPTS='-XX:+UseG1GC -Xmx3000m'