moved JVM_ARGS from run.sh to Dockerfile

cagdascirit · Nov 17, 2015 · 511fb5c · 511fb5c
1 parent 3fa4ed1
commit 511fb5c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/slave_running_gatling_on_tutum/Dockerfile b/slave_running_gatling_on_tutum/Dockerfile
@@ -10,4 +10,7 @@ COPY modified_jmeter_core/ApacheJMeter_core.jar ${JMETER_HOME}/lib/ext/
 ADD run.sh /run.sh
 RUN chmod +x /run.sh
 
+ENV JVM_ARGS="-server -Xss10M -XX:+UseThreadPriorities -XX:ThreadPriorityPolicy=42 -Xms512M -Xmx512M -Xmn100M -XX:+HeapDumpOnOutOfMemoryError -XX:+AggressiveOpts -XX:+OptimizeStringConcat -XX:+UseFastAccessorMethods -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false ${JAVA_OPTS}"
+
 ENTRYPOINT ["/run.sh"]
+
diff --git a/slave_running_gatling_on_tutum/run.sh b/slave_running_gatling_on_tutum/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-JVM_ARGS="-server -Xss10M -XX:+UseThreadPriorities -XX:ThreadPriorityPolicy=42 -Xms512M -Xmx512M -Xmn100M -XX:+HeapDumpOnOutOfMemoryError -XX:+AggressiveOpts -XX:+OptimizeStringConcat -XX:+UseFastAccessorMethods -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false ${JAVA_OPTS}"
 jmeter.sh -s -Jserver.rmi.localport=60000 -Djava.rmi.server.hostname=$HOSTNAME "$@"
+