From 9d585ca2f12c407e2db3fcab9ac370a96e2815ea Mon Sep 17 00:00:00 2001
From: "egon w. stemle" <egon.stemle@eurac.edu>
Date: Thu, 24 Oct 2019 18:00:24 +0200
Subject: [PATCH] Increase memory (just-in-case); Add explicit CATALINA_PID
 path

---
 dockerfiles/Dockerfile.dspace                     | 2 +-
 dockerfiles/commul-customization/setenv.sh        | 4 ----
 dockerfiles/commul-customization/tomcat-setenv.sh | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 dockerfiles/commul-customization/setenv.sh
 create mode 100644 dockerfiles/commul-customization/tomcat-setenv.sh

diff --git a/dockerfiles/Dockerfile.dspace b/dockerfiles/Dockerfile.dspace
index a2c0fcc..9a84312 100644
--- a/dockerfiles/Dockerfile.dspace
+++ b/dockerfiles/Dockerfile.dspace
@@ -46,7 +46,7 @@ RUN chown -R tomcat8:tomcat8 /opt/tomcat8
 COPY commul-customization/tomcat8 /etc/init.d/
 RUN chmod a+x /etc/init.d/tomcat8
 COPY commul-customization/catalina.sh /opt/tomcat8/bin/
-COPY commul-customization/setenv.sh /opt/tomcat8/bin/
+COPY commul-customization/tomcat-setenv.sh /opt/tomcat8/bin/
 COPY commul-customization/tomcat-server.xml /opt/tomcat8/conf/server.xml
 
 
diff --git a/dockerfiles/commul-customization/setenv.sh b/dockerfiles/commul-customization/setenv.sh
deleted file mode 100644
index bd9505c..0000000
--- a/dockerfiles/commul-customization/setenv.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export CATALINA_OPTS="$CATALINA_OPTS -Xms2048m"
-export CATALINA_OPTS="$CATALINA_OPTS -Xmx4096m"
-export CATALINA_OPTS="$CATALINA_OPTS -XX:MaxPermSize=256m"
-
diff --git a/dockerfiles/commul-customization/tomcat-setenv.sh b/dockerfiles/commul-customization/tomcat-setenv.sh
new file mode 100644
index 0000000..d82f05a
--- /dev/null
+++ b/dockerfiles/commul-customization/tomcat-setenv.sh
@@ -0,0 +1,4 @@
+export CATALINA_OPTS="$CATALINA_OPTS -Xms4096m"
+export CATALINA_OPTS="$CATALINA_OPTS -Xmx8192m"
+export CATALINA_OPTS="$CATALINA_OPTS -XX:MaxPermSize=256m"
+export CATALINA_PID="$CATALINA_BASE/tomcat.pid"
-- 
GitLab