From f2b0718918e530edddeb988bb341b394e4035590 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Mon, 2 Jul 2018 18:33:20 -0400
Subject: [PATCH] fixes for JAVA_OPTS, logging; add JCE; bump Tomcat ver

---
 Dockerfile                        | 11 ++++++++---
 container_files/system/startup.sh |  4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0254fed..255043a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,11 +10,11 @@ ENV JAVA_VERSION=8u171 \
     JAVA_BUNDLE_ID=512cd62ec5174c3487ac17c61aaa89e8 \
 ##tomcat \
     TOMCAT_MAJOR=9 \
-    TOMCAT_VERSION=9.0.8 \
+    TOMCAT_VERSION=9.0.10 \
 ##shib-idp \
     VERSION=3.3.3 \
 ##TIER \
-    TIERVERSION=180601 \
+    TIERVERSION=180701 \
 ################## \
 ### OTHER VARS ### \
 ################## \
@@ -24,7 +24,7 @@ ENV JAVA_VERSION=8u171 \
     MAINTAINER=tier \
 #java \
     JAVA_HOME=/usr \
-    JAVA_OPTS=-Xmx3000m -XX:MaxPermSize=256m \
+    JAVA_OPTS='-Xmx3000m -XX:MaxPermSize=256m' \
 #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 \
@@ -77,6 +77,11 @@ RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
 	&& curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo \
 	&& yum -y install zulu-8 && alternatives --install /usr/bin/java java $JAVA_HOME/bin/java 200000
 
+#install Zulu JCE
+RUN curl -o /tmp/ZuluJCEPolicies.zip https://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip \
+	&& cd /tmp && unzip -oj ZuluJCEPolicies.zip ZuluJCEPolicies/local_policy.jar -d $JAVA_HOME/lib/jvm/zulu-8/jre/lib/security/ \
+	&& 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
 #
diff --git a/container_files/system/startup.sh b/container_files/system/startup.sh
index bcefc9f..dcab45f 100644
--- a/container_files/system/startup.sh
+++ b/container_files/system/startup.sh
@@ -47,6 +47,10 @@ sed "s#<File>\${idp.logfiles}/idp-consent-audit.log</File>#<File>/tmp/logidp-con
 rm -f ${IDP_LOG_CFG_FILE}.tmp
 rm -f ${IDP_LOG_CFG_FILE}.tmp2
 rm -f ${IDP_LOG_CFG_FILE}.tmp
+# Remove auto-rolling of logfile
+sed -i -e 's/rolling.RollingFileAppender/FileAppender/g' ${IDP_LOG_CFG_FILE}
+sed -i -e '/<rollingPolicy/,/<\/rollingPolicy>/d' ${IDP_LOG_CFG_FILE}
+
 
 #launch supervisord
 /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf