Merge pull request #1 from addteq-andrew/2.53.1

update images to use selenium version 2.53.1 and chrome webdriver 2.22

Author: addteq-himanshu

Base/Dockerfile

@@ -27,7 +27,7 @@ RUN apt-get update -qqy \
 # Selenium
 #==========
 RUN  mkdir -p /opt/selenium \
-  && wget --no-verbose https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.0.jar -O /opt/selenium/selenium-server-standalone.jar
+  && wget --no-verbose https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar -O /opt/selenium/selenium-server-standalone.jar
 
 #========================================
 # Add normal user with passwordless sudo

Hub/Dockerfile

@@ -1,4 +1,4 @@
-FROM selenium/base:2.53.0
+FROM selenium/base:2.53.1
 MAINTAINER Selenium <[email protected]>
 
 #========================

NodeBase/Dockerfile

@@ -1,4 +1,4 @@
-FROM selenium/base:2.53.0
+FROM selenium/base:2.53.1
 MAINTAINER Selenium <[email protected]>
 
 ENV DEBIAN_FRONTEND noninteractive

NodeBase/entry_point.sh

@@ -9,10 +9,10 @@ if [ ! -e /opt/selenium/config.json ]; then
   exit 1
 fi
 
-if [ -z "$HUB_PORT_4444_TCP_ADDR" ]; then
-  echo Not linked with a running Hub container 1>&2
-  exit 1
-fi
+# if [ -z "$HUB_PORT_4444_TCP_ADDR" ]; then
+#   echo Not linked with a running Hub container 1>&2
+#   exit 1
+# fi
 
 function shutdown {
   kill -s SIGTERM $NODE_PID
@@ -32,10 +32,13 @@ fi
 # TODO: Look into http://www.seleniumhq.org/docs/05_selenium_rc.jsp#browser-side-logs
 
 SERVERNUM=$(get_server_num)
+
+rm -f /tmp/.X*lock
+
 xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
   java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
     -role node \
-    -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
+    -hub http://hub:4444/grid/register \    
     ${REMOTE_HOST_PARAM} \
     -nodeConfig /opt/selenium/config.json \
     ${SE_OPTS} &

NodeChrome/Dockerfile

@@ -1,4 +1,4 @@
-FROM selenium/node-base:2.53.0
+FROM selenium/node-base:2.53.1
 MAINTAINER Selenium <[email protected]>
 
 USER root
@@ -17,7 +17,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
 #==================
 # Chrome webdriver
 #==================
-ENV CHROME_DRIVER_VERSION 2.21
+ENV CHROME_DRIVER_VERSION 2.22
 RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
   && rm -rf /opt/selenium/chromedriver \
   && unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \

NodeChromeDebug/Dockerfile

@@ -1,4 +1,4 @@
-FROM selenium/node-chrome:2.53.0
+FROM selenium/node-chrome:2.53.1
 MAINTAINER Selenium <[email protected]>
 
 USER root

NodeChromeDebug/entry_point.sh

@@ -9,10 +9,10 @@ if [ ! -e /opt/selenium/config.json ]; then
   exit 1
 fi
 
-if [ -z "$HUB_PORT_4444_TCP_ADDR" ]; then
-  echo Not linked with a running Hub container 1>&2
-  exit 1
-fi
+# if [ -z "$HUB_PORT_4444_TCP_ADDR" ]; then
+#   echo Not linked with a running Hub container 1>&2
+#   exit 1
+# fi
 
 function shutdown {
   kill -s SIGTERM $NODE_PID
@@ -32,6 +32,9 @@ fi
 # TODO: Look into http://www.seleniumhq.org/docs/05_selenium_rc.jsp#browser-side-logs
 
 SERVERNUM=$(get_server_num)
+
+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 \
@@ -40,7 +43,7 @@ env | cut -f 1 -d "=" | sort > asroot
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
   java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
     -role node \
-    -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
+    -hub http://hub:4444/grid/register \
     ${REMOTE_HOST_PARAM} \
     -nodeConfig /opt/selenium/config.json \
     ${SE_OPTS} &

NodeFirefox/Dockerfile

@@ -1,4 +1,4 @@
-FROM selenium/node-base:2.53.0
+FROM selenium/node-base:2.53.1
 MAINTAINER Selenium <[email protected]>
 
 USER root

NodeFirefoxDebug/Dockerfile

@@ -1,4 +1,4 @@
-FROM selenium/node-firefox:2.53.0
+FROM selenium/node-firefox:2.53.1
 MAINTAINER Selenium <[email protected]>
 
 USER root

NodeFirefoxDebug/entry_point.sh

@@ -9,10 +9,10 @@ if [ ! -e /opt/selenium/config.json ]; then
   exit 1
 fi
 
-if [ -z "$HUB_PORT_4444_TCP_ADDR" ]; then
-  echo Not linked with a running Hub container 1>&2
-  exit 1
-fi
+# if [ -z "$HUB_PORT_4444_TCP_ADDR" ]; then
+#   echo Not linked with a running Hub container 1>&2
+#   exit 1
+# fi
 
 function shutdown {
   kill -s SIGTERM $NODE_PID
@@ -32,6 +32,9 @@ fi
 # TODO: Look into http://www.seleniumhq.org/docs/05_selenium_rc.jsp#browser-side-logs
 
 SERVERNUM=$(get_server_num)
+
+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 \
@@ -40,7 +43,7 @@ env | cut -f 1 -d "=" | sort > asroot
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
   java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
     -role node \
-    -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
+    -hub http://hub:4444/grid/register \
     ${REMOTE_HOST_PARAM} \
     -nodeConfig /opt/selenium/config.json \
     ${SE_OPTS} &