merge feature JAVA_OPTS env variable to control java process

rubytester · rubytester · commit 1e3a80974a48 · 2015-07-28T11:55:58.000-05:00
diff --git a/Hub/entry_point.sh b/Hub/entry_point.sh
@@ -15,6 +15,7 @@ function shutdown {
 }
 
 java -jar /opt/selenium/selenium-server-standalone.jar \
+  ${JAVA_OPTS} \
   -role hub \
   -hubConfig $CONF &
 NODE_PID=$!
diff --git a/NodeBase/entry_point.sh b/NodeBase/entry_point.sh
@@ -26,6 +26,7 @@ fi
 
 xvfb-run --server-args="$DISPLAY -screen 0 $GEOMETRY -ac +extension RANDR" \
   java -jar /opt/selenium/selenium-server-standalone.jar \
+    ${JAVA_OPTS} \
     -role node \
     -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
     ${REMOTE_HOST_PARAM} \
diff --git a/NodeChromeDebug/entry_point.sh b/NodeChromeDebug/entry_point.sh
@@ -28,6 +28,7 @@ sudo -E -i -u seluser \
   DISPLAY=$DISPLAY \
   xvfb-run --server-args="$DISPLAY -screen 0 $GEOMETRY -ac +extension RANDR" \
   java -jar /opt/selenium/selenium-server-standalone.jar \
+    ${JAVA_OPTS} \
     -role node \
     -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
     ${REMOTE_HOST_PARAM} \
diff --git a/NodeFirefoxDebug/entry_point.sh b/NodeFirefoxDebug/entry_point.sh
@@ -28,6 +28,7 @@ sudo -E -i -u seluser \
   DISPLAY=$DISPLAY \
   xvfb-run --server-args="$DISPLAY -screen 0 $GEOMETRY -ac +extension RANDR" \
   java -jar /opt/selenium/selenium-server-standalone.jar \
+    ${JAVA_OPTS} \
     -role node \
     -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
     ${REMOTE_HOST_PARAM} \
diff --git a/README.md b/README.md
@@ -48,6 +48,14 @@ $ docker run -d --link selenium-hub:hub selenium/node-chrome:2.46.0
 $ docker run -d --link selenium-hub:hub selenium/node-firefox:2.46.0
 ```
 
+### Java Environment Options
+
+You can pass JAVA_OPTS environment variable to selenium java processes.
+
+``` bash
+$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:2.46.0
+```
+
 ## Building the images
 
 Ensure you have the `ubuntu:14.04` base image downloaded, this step is _optional_ since docker takes care of downloading the parent base image automatically.
diff --git a/Standalone/entry_point.sh b/Standalone/entry_point.sh
@@ -7,7 +7,7 @@ function shutdown {
 }
 
 xvfb-run --server-args="$DISPLAY -screen 0 $GEOMETRY -ac +extension RANDR" \
-  java -jar /opt/selenium/selenium-server-standalone.jar &
+  java -jar /opt/selenium/selenium-server-standalone.jar ${JAVA_OPTS} &
 NODE_PID=$!
 
 trap shutdown SIGTERM SIGINT
diff --git a/StandaloneChrome/entry_point.sh b/StandaloneChrome/entry_point.sh
@@ -7,7 +7,7 @@ function shutdown {
 }
 
 xvfb-run --server-args="$DISPLAY -screen 0 $GEOMETRY -ac +extension RANDR" \
-  java -jar /opt/selenium/selenium-server-standalone.jar &
+  java -jar /opt/selenium/selenium-server-standalone.jar ${JAVA_OPTS} &
 NODE_PID=$!
 
 trap shutdown SIGTERM SIGINT
diff --git a/StandaloneDebug/entry_point.sh b/StandaloneDebug/entry_point.sh
@@ -9,7 +9,7 @@ function shutdown {
 sudo -E -i -u seluser \
   DISPLAY=$DISPLAY \
   xvfb-run --server-args="$DISPLAY -screen 0 $GEOMETRY -ac +extension RANDR" \
-  java -jar /opt/selenium/selenium-server-standalone.jar &
+  java -jar /opt/selenium/selenium-server-standalone.jar ${JAVA_OPTS} &
 NODE_PID=$!
 
 trap shutdown SIGTERM SIGINT
diff --git a/StandaloneDebugChrome/entry_point.sh b/StandaloneDebugChrome/entry_point.sh
@@ -9,7 +9,7 @@ function shutdown {
 sudo -E -i -u seluser \
   DISPLAY=$DISPLAY \
   xvfb-run --server-args="$DISPLAY -screen 0 $GEOMETRY -ac +extension RANDR" \
-  java -jar /opt/selenium/selenium-server-standalone.jar &
+  java -jar /opt/selenium/selenium-server-standalone.jar ${JAVA_OPTS} &
 NODE_PID=$!
 
 trap shutdown SIGTERM SIGINT
diff --git a/StandaloneDebugFirefox/entry_point.sh b/StandaloneDebugFirefox/entry_point.sh
@@ -9,7 +9,7 @@ function shutdown {
 sudo -E -i -u seluser \
   DISPLAY=$DISPLAY \
   xvfb-run --server-args="$DISPLAY -screen 0 $GEOMETRY -ac +extension RANDR" \
-  java -jar /opt/selenium/selenium-server-standalone.jar &
+  java -jar /opt/selenium/selenium-server-standalone.jar ${JAVA_OPTS} &
 NODE_PID=$!
 
 trap shutdown SIGTERM SIGINT
diff --git a/StandaloneFirefox/entry_point.sh b/StandaloneFirefox/entry_point.sh
@@ -7,7 +7,7 @@ function shutdown {
 }
 
 xvfb-run --server-args="$DISPLAY -screen 0 $GEOMETRY -ac +extension RANDR" \
-  java -jar /opt/selenium/selenium-server-standalone.jar &
+  java -jar /opt/selenium/selenium-server-standalone.jar ${JAVA_OPTS} &
 NODE_PID=$!
 
 trap shutdown SIGTERM SIGINT

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ function shutdown {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`java -jar /opt/selenium/selenium-server-standalone.jar \`
	`18`	`+ ${JAVA_OPTS} \`
`18`	`19`	`-role hub \`
`19`	`20`	`-hubConfig $CONF &`
`20`	`21`	`NODE_PID=$!`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ function shutdown {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`xvfb-run --server-args="$DISPLAY -screen 0 $GEOMETRY -ac +extension RANDR" \`
`10`		`- java -jar /opt/selenium/selenium-server-standalone.jar &`
	`10`	`+ java -jar /opt/selenium/selenium-server-standalone.jar ${JAVA_OPTS} &`
`11`	`11`	`NODE_PID=$!`
`12`	`12`
`13`	`13`	`trap shutdown SIGTERM SIGINT`