This commit is contained in:
Dennis Schwerdel 2017-01-25 12:26:30 +01:00
parent a425984d29
commit 48ed611563
3 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,6 @@
"mysql": {}, "mysql": {},
"ldap": {} "ldap": {}
}, },
"memoryLimit": 2048,
"manifestVersion": 1, "manifestVersion": 1,
"website": "http://guacamole.incubator.apache.org/", "website": "http://guacamole.incubator.apache.org/",
"contactEmail": "support@cloudron.io", "contactEmail": "support@cloudron.io",

View File

@ -56,7 +56,6 @@ RUN ln -s /run/tomcat/temp /usr/share/tomcat8/temp \
&& ln -s /run/tomcat/webapps /usr/share/tomcat8/webapps && ln -s /run/tomcat/webapps /usr/share/tomcat8/webapps
ENV GUACAMOLE_HOME /app/code ENV GUACAMOLE_HOME /app/code
ENV JAVA_OPTS "-Djava.awt.headless=true -server -Xmx512M -Djava.security.egd=file:/dev/urandom"
ADD start.sh /app/code/start.sh ADD start.sh /app/code/start.sh

View File

@ -30,4 +30,6 @@ $MYSQL < /app/code/schema/001-create-schema.sql \
/app/code/sbin/guacd /app/code/sbin/guacd
export JAVA_OPTS="-Djava.awt.headless=true -XX:MaxRAM=256M -Djava.security.egd=file:/dev/urandom"
exec /usr/share/tomcat8/bin/catalina.sh run exec /usr/share/tomcat8/bin/catalina.sh run