From 006a234c38985cc5d5670d0c7a37211209a1a8f7 Mon Sep 17 00:00:00 2001 From: Andrew Leedom Date: Thu, 14 Jul 2016 16:29:47 -0400 Subject: [PATCH] update images to use selenium version 2.53.1 and chrome webdriver 2.22 --- Base/Dockerfile | 2 +- Hub/Dockerfile | 2 +- NodeBase/Dockerfile | 2 +- NodeBase/entry_point.sh | 13 ++++++++----- NodeChrome/Dockerfile | 4 ++-- NodeChromeDebug/Dockerfile | 2 +- NodeChromeDebug/entry_point.sh | 13 ++++++++----- NodeFirefox/Dockerfile | 2 +- NodeFirefoxDebug/Dockerfile | 2 +- NodeFirefoxDebug/entry_point.sh | 13 ++++++++----- 10 files changed, 32 insertions(+), 23 deletions(-) diff --git a/Base/Dockerfile b/Base/Dockerfile index 17d8273c2b..a6a04013ed 100644 --- a/Base/Dockerfile +++ b/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 diff --git a/Hub/Dockerfile b/Hub/Dockerfile index 1c39d8a4b8..cc24279418 100644 --- a/Hub/Dockerfile +++ b/Hub/Dockerfile @@ -1,4 +1,4 @@ -FROM selenium/base:2.53.0 +FROM selenium/base:2.53.1 MAINTAINER Selenium #======================== diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile index 212b0d4265..41b28bb530 100644 --- a/NodeBase/Dockerfile +++ b/NodeBase/Dockerfile @@ -1,4 +1,4 @@ -FROM selenium/base:2.53.0 +FROM selenium/base:2.53.1 MAINTAINER Selenium ENV DEBIAN_FRONTEND noninteractive diff --git a/NodeBase/entry_point.sh b/NodeBase/entry_point.sh index 4d8a4244a0..36005e50f4 100644 --- a/NodeBase/entry_point.sh +++ b/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} & diff --git a/NodeChrome/Dockerfile b/NodeChrome/Dockerfile index 38dfce8878..52c7b724ff 100644 --- a/NodeChrome/Dockerfile +++ b/NodeChrome/Dockerfile @@ -1,4 +1,4 @@ -FROM selenium/node-base:2.53.0 +FROM selenium/node-base:2.53.1 MAINTAINER Selenium 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 \ diff --git a/NodeChromeDebug/Dockerfile b/NodeChromeDebug/Dockerfile index c6d00982f4..2924755d5d 100644 --- a/NodeChromeDebug/Dockerfile +++ b/NodeChromeDebug/Dockerfile @@ -1,4 +1,4 @@ -FROM selenium/node-chrome:2.53.0 +FROM selenium/node-chrome:2.53.1 MAINTAINER Selenium USER root diff --git a/NodeChromeDebug/entry_point.sh b/NodeChromeDebug/entry_point.sh index e83f0fb6ec..a8812b4e70 100644 --- a/NodeChromeDebug/entry_point.sh +++ b/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} & diff --git a/NodeFirefox/Dockerfile b/NodeFirefox/Dockerfile index 307f11adc2..86f57ddb2b 100644 --- a/NodeFirefox/Dockerfile +++ b/NodeFirefox/Dockerfile @@ -1,4 +1,4 @@ -FROM selenium/node-base:2.53.0 +FROM selenium/node-base:2.53.1 MAINTAINER Selenium USER root diff --git a/NodeFirefoxDebug/Dockerfile b/NodeFirefoxDebug/Dockerfile index d1a5c0e5a1..451b8c3837 100644 --- a/NodeFirefoxDebug/Dockerfile +++ b/NodeFirefoxDebug/Dockerfile @@ -1,4 +1,4 @@ -FROM selenium/node-firefox:2.53.0 +FROM selenium/node-firefox:2.53.1 MAINTAINER Selenium USER root diff --git a/NodeFirefoxDebug/entry_point.sh b/NodeFirefoxDebug/entry_point.sh index e83f0fb6ec..a8812b4e70 100644 --- a/NodeFirefoxDebug/entry_point.sh +++ b/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} &