Merge remote-tracking branch 'origin/pr/455'

Hub/Dockerfile

@@ -11,21 +11,20 @@ MAINTAINER Selenium <[email protected]>
 
 EXPOSE 4444
 
-ENV GRID_THROW_ON_CAPABILITY_NOT_PRESENT true
-# In milliseconds
+# As integer, maps to "maxSession"
+ENV GRID_MAX_SESSION 5
+# In milliseconds, maps to "newSessionWaitTimeout"
 ENV GRID_NEW_SESSION_WAIT_TIMEOUT -1
+# As a boolean, maps to "throwOnCapabilityNotPresent"
+ENV GRID_THROW_ON_CAPABILITY_NOT_PRESENT true
+# As an integer
 ENV GRID_JETTY_MAX_THREADS -1
-# In milliseconds
-ENV GRID_NODE_POLLING  5000
-# In milliseconds
+# In milliseconds, maps to "cleanUpCycle"
 ENV GRID_CLEAN_UP_CYCLE 5000
-# In seconds
-ENV GRID_TIMEOUT 30
-# In seconds
+# In seconds, maps to "browserTimeout"
 ENV GRID_BROWSER_TIMEOUT 0
-ENV GRID_MAX_SESSION 5
-# In milliseconds
-ENV GRID_UNREGISTER_IF_STILL_DOWN_AFTER 30000
+# In seconds, maps to "timeout"
+ENV GRID_TIMEOUT 30
 
 COPY generate_config /opt/selenium/generate_config
 COPY entry_point.sh /opt/bin/entry_point.sh
@@ -34,5 +33,4 @@ RUN chown -R seluser /opt/selenium
 
 USER seluser
 
-CMD ["/opt/bin/entry_point.sh"]
-
+CMD ["/opt/bin/entry_point.sh"]

Hub/Dockerfile.txt

@@ -6,21 +6,20 @@ MAINTAINER Selenium <[email protected]>
 
 EXPOSE 4444
 
-ENV GRID_THROW_ON_CAPABILITY_NOT_PRESENT true
-# In milliseconds
+# As integer, maps to "maxSession"
+ENV GRID_MAX_SESSION 5
+# In milliseconds, maps to "newSessionWaitTimeout"
 ENV GRID_NEW_SESSION_WAIT_TIMEOUT -1
+# As a boolean, maps to "throwOnCapabilityNotPresent"
+ENV GRID_THROW_ON_CAPABILITY_NOT_PRESENT true
+# As an integer
 ENV GRID_JETTY_MAX_THREADS -1
-# In milliseconds
-ENV GRID_NODE_POLLING  5000
-# In milliseconds
+# In milliseconds, maps to "cleanUpCycle"
 ENV GRID_CLEAN_UP_CYCLE 5000
-# In seconds
-ENV GRID_TIMEOUT 30
-# In seconds
+# In seconds, maps to "browserTimeout"
 ENV GRID_BROWSER_TIMEOUT 0
-ENV GRID_MAX_SESSION 5
-# In milliseconds
-ENV GRID_UNREGISTER_IF_STILL_DOWN_AFTER 30000
+# In seconds, maps to "timeout"
+ENV GRID_TIMEOUT 30
 
 COPY generate_config /opt/selenium/generate_config
 COPY entry_point.sh /opt/bin/entry_point.sh
@@ -29,5 +28,4 @@ RUN chown -R seluser /opt/selenium
 
 USER seluser
 
-CMD ["/opt/bin/entry_point.sh"]
-
+CMD ["/opt/bin/entry_point.sh"]

Hub/entry_point.sh

@@ -26,5 +26,4 @@ java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
 NODE_PID=$!
 
 trap shutdown SIGTERM SIGINT
-wait $NODE_PID
-
+wait $NODE_PID

Hub/generate.sh

@@ -6,4 +6,4 @@ echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> ./Dockerfile
 echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
 echo FROM selenium/base:$VERSION >> ./Dockerfile
-cat ./Dockerfile.txt >> ./Dockerfile
+cat ./Dockerfile.txt >> ./Dockerfile

Hub/generate_config

@@ -4,17 +4,13 @@ echo "
 {
   \"host\": null,
   \"port\": 4444,
-  \"prioritizer\": null,
+  \"maxSession\": $GRID_MAX_SESSION,
+  \"newSessionWaitTimeout\": $GRID_NEW_SESSION_WAIT_TIMEOUT,
   \"capabilityMatcher\": \"org.openqa.grid.internal.utils.DefaultCapabilityMatcher\",
   \"throwOnCapabilityNotPresent\": $GRID_THROW_ON_CAPABILITY_NOT_PRESENT,
-  \"newSessionWaitTimeout\": $GRID_NEW_SESSION_WAIT_TIMEOUT,
   \"jettyMaxThreads\": $GRID_JETTY_MAX_THREADS,
-  \"nodePolling\": $GRID_NODE_POLLING,
   \"cleanUpCycle\": $GRID_CLEAN_UP_CYCLE,
-  \"timeout\": $GRID_TIMEOUT,
   \"browserTimeout\": $GRID_BROWSER_TIMEOUT,
-  \"maxSession\": $GRID_MAX_SESSION,
-  \"unregisterIfStillDownAfter\": $GRID_UNREGISTER_IF_STILL_DOWN_AFTER
-}" 
-
-
+  \"timeout\": $GRID_TIMEOUT,
+  \"prioritizer\": null,
+}"

NodeBase/Dockerfile

@@ -36,4 +36,4 @@ ENV DISPLAY :99.0
 
 USER seluser
 
-CMD ["/opt/bin/entry_point.sh"]
+CMD ["/opt/bin/entry_point.sh"]

NodeBase/Dockerfile.txt

@@ -31,4 +31,4 @@ ENV DISPLAY :99.0
 
 USER seluser
 
-CMD ["/opt/bin/entry_point.sh"]
+CMD ["/opt/bin/entry_point.sh"]

NodeBase/entry_point.sh

@@ -44,4 +44,4 @@ xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR"
 NODE_PID=$!
 
 trap shutdown SIGTERM SIGINT
-wait $NODE_PID
+wait $NODE_PID

NodeBase/functions.sh

@@ -3,5 +3,4 @@
 # https://github.com/SeleniumHQ/docker-selenium/issues/184
 function get_server_num() {
   echo $(echo $DISPLAY | sed -r -e 's/([^:]+)?:([0-9]+)(\.[0-9]+)?/\2/')
-}
-
+}

NodeBase/generate.sh

@@ -6,4 +6,4 @@ echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> ./Dockerfile
 echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
 echo FROM selenium/base:$VERSION >> ./Dockerfile
-cat ./Dockerfile.txt >> ./Dockerfile
+cat ./Dockerfile.txt >> ./Dockerfile

NodeChrome/Dockerfile

@@ -41,11 +41,23 @@ RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.stor
 #========================
 # Selenium Configuration
 #========================
+# As integer, maps to "maxInstances"
 ENV NODE_MAX_INSTANCES 1
+# As integer, maps to "maxSession"
 ENV NODE_MAX_SESSION 1
-ENV NODE_REGISTER_CYCLE 5000
+# As integer, maps to "port"
 ENV NODE_PORT 5555
+# In milliseconds, maps to "registerCycle"
+ENV NODE_REGISTER_CYCLE 5000
+# In milliseconds, maps to "nodePolling"
+ENV NODE_POLLING 5000
+# In milliseconds, maps to "unregisterIfStillDownAfter"
+ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
+# As integer, maps to "downPollingLimit"
+ENV NODE_DOWN_POLLING_LIMIT 2
+# As string, maps to "applicationName"
 ENV NODE_APPLICATION_NAME ""
+
 COPY generate_config /opt/selenium/generate_config
 RUN chmod +x /opt/selenium/generate_config
 
@@ -61,4 +73,4 @@ RUN chown -R seluser:seluser /opt/selenium
 # https://github.com/SeleniumHQ/docker-selenium/issues/87
 RUN echo "DBUS_SESSION_BUS_ADDRESS=/dev/null" >> /etc/environment
 
-USER seluser
+USER seluser

NodeChrome/Dockerfile.txt

@@ -36,11 +36,23 @@ RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.stor
 #========================
 # Selenium Configuration
 #========================
+# As integer, maps to "maxInstances"
 ENV NODE_MAX_INSTANCES 1
+# As integer, maps to "maxSession"
 ENV NODE_MAX_SESSION 1
-ENV NODE_REGISTER_CYCLE 5000
+# As integer, maps to "port"
 ENV NODE_PORT 5555
+# In milliseconds, maps to "registerCycle"
+ENV NODE_REGISTER_CYCLE 5000
+# In milliseconds, maps to "nodePolling"
+ENV NODE_POLLING 5000
+# In milliseconds, maps to "unregisterIfStillDownAfter"
+ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
+# As integer, maps to "downPollingLimit"
+ENV NODE_DOWN_POLLING_LIMIT 2
+# As string, maps to "applicationName"
 ENV NODE_APPLICATION_NAME ""
+
 COPY generate_config /opt/selenium/generate_config
 RUN chmod +x /opt/selenium/generate_config
 
@@ -56,4 +68,4 @@ RUN chown -R seluser:seluser /opt/selenium
 # https://github.com/SeleniumHQ/docker-selenium/issues/87
 RUN echo "DBUS_SESSION_BUS_ADDRESS=/dev/null" >> /etc/environment
 
-USER seluser
+USER seluser

NodeChrome/generate.sh

@@ -6,4 +6,4 @@ echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> ./Dockerfile
 echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
 echo FROM selenium/node-base:$VERSION >> ./Dockerfile
-cat ./Dockerfile.txt >> ./Dockerfile
+cat ./Dockerfile.txt >> ./Dockerfile

NodeChrome/generate_config

@@ -18,5 +18,7 @@ echo "
   \"port\": $NODE_PORT,
   \"register\": true,
   \"registerCycle\": $NODE_REGISTER_CYCLE
-}" 
-
+  \"nodePolling\": $NODE_POLLING,
+  \"unregisterIfStillDownAfter\": $NODE_UNREGISTER_IF_STILL_DOWN_AFTER,
+  \"downPollingLimit\": $NODE_DOWN_POLLING_LIMIT
+}"

NodeChromeDebug/entry_point.sh

@@ -38,7 +38,7 @@ rm -f /tmp/.X*lock
 env | cut -f 1 -d "=" | sort > asroot
   sudo -E -u seluser -i env | cut -f 1 -d "=" | sort > asseluser
   sudo -E -i -u seluser \
-    $(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done) \
+  $(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done) \
   DISPLAY=$DISPLAY \
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
   java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \

NodeFirefox/Dockerfile

@@ -37,11 +37,23 @@ RUN wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geck
 #========================
 # Selenium Configuration
 #========================
+# As integer, maps to "maxInstances"
 ENV NODE_MAX_INSTANCES 1
+# As integer, maps to "maxSession"
 ENV NODE_MAX_SESSION 1
-ENV NODE_REGISTER_CYCLE 5000
+# As integer, maps to "port"
 ENV NODE_PORT 5555
+# In milliseconds, maps to "registerCycle"
+ENV NODE_REGISTER_CYCLE 5000
+# In milliseconds, maps to "nodePolling"
+ENV NODE_POLLING 5000
+# In milliseconds, maps to "unregisterIfStillDownAfter"
+ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
+# As integer, maps to "downPollingLimit"
+ENV NODE_DOWN_POLLING_LIMIT 2
+# As string, maps to "applicationName"
 ENV NODE_APPLICATION_NAME ""
+
 COPY generate_config /opt/selenium/generate_config
 RUN chmod +x /opt/selenium/generate_config \
   && chown -R seluser:seluser /opt/selenium

NodeFirefox/Dockerfile.txt

@@ -32,11 +32,23 @@ RUN wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geck
 #========================
 # Selenium Configuration
 #========================
+# As integer, maps to "maxInstances"
 ENV NODE_MAX_INSTANCES 1
+# As integer, maps to "maxSession"
 ENV NODE_MAX_SESSION 1
-ENV NODE_REGISTER_CYCLE 5000
+# As integer, maps to "port"
 ENV NODE_PORT 5555
+# In milliseconds, maps to "registerCycle"
+ENV NODE_REGISTER_CYCLE 5000
+# In milliseconds, maps to "nodePolling"
+ENV NODE_POLLING 5000
+# In milliseconds, maps to "unregisterIfStillDownAfter"
+ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
+# As integer, maps to "downPollingLimit"
+ENV NODE_DOWN_POLLING_LIMIT 2
+# As string, maps to "applicationName"
 ENV NODE_APPLICATION_NAME ""
+
 COPY generate_config /opt/selenium/generate_config
 RUN chmod +x /opt/selenium/generate_config \
   && chown -R seluser:seluser /opt/selenium

NodeFirefox/generate_config

@@ -6,8 +6,8 @@ echo "
 {
   \"capabilities\": [
     {
-      \"version\": \"$FIREFOX_VERSION\",
-      \"browserName\": \"firefox\",
+      \"version\": \"$CHROME_VERSION\",
+      \"browserName\": \"chrome\",
       \"maxInstances\": $NODE_MAX_INSTANCES,
       \"seleniumProtocol\": \"WebDriver\",
       \"applicationName\": \"$NODE_APPLICATION_NAME\"
@@ -18,5 +18,7 @@ echo "
   \"port\": $NODE_PORT,
   \"register\": true,
   \"registerCycle\": $NODE_REGISTER_CYCLE
-}" 
-
+  \"nodePolling\": $NODE_POLLING,
+  \"unregisterIfStillDownAfter\": $NODE_UNREGISTER_IF_STILL_DOWN_AFTER,
+  \"downPollingLimit\": $NODE_DOWN_POLLING_LIMIT
+}"