Commit b8d02288 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '468-memory-limit-on-docker-instance' into 'devel_12.0.x'

Resolve "memory limit on docker instance"

See merge request !363
parents e2fd42c7 10e489ed
......@@ -45,6 +45,7 @@ ADD policy-rc.d /tmp/policy-rc.d
RUN apt-get update
RUN sed -i "/JAVA_OPTS=\"-Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC\"/c\JAVA_OPTS=\"-Djava.awt.headless=true -Xmx3096m -XX:+UseConcMarkSweepGC\"" /etc/default/tomcat7
#when we install minerva allow to start services, so everything can be installed properly
#but we need to disable tomcat7 because tomcat7 requires SYS_PTRACE and we cannot start it:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment