Skip to content

update images to use selenium version 2.53.1 and chrome webdriver 2.22 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2016
Merged

update images to use selenium version 2.53.1 and chrome webdriver 2.22 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Hub/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM selenium/base:2.53.0
FROM selenium/base:2.53.1
MAINTAINER Selenium <selenium-developers@googlegroups.com>

#========================
Expand Down
2 changes: 1 addition & 1 deletion NodeBase/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM selenium/base:2.53.0
FROM selenium/base:2.53.1
MAINTAINER Selenium <selenium-developers@googlegroups.com>

ENV DEBIAN_FRONTEND noninteractive
Expand Down
13 changes: 8 additions & 5 deletions NodeBase/entry_point.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@addteq-himanshu I also added this change from SeleniumHQ#230 as I experienced this behavior when restarting containers.


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 \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@addteq-andrew Any reason why the variable name changed from the original for this line?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made the changes as per SeleniumHQ#238

${REMOTE_HOST_PARAM} \
-nodeConfig /opt/selenium/config.json \
${SE_OPTS} &
Expand Down
4 changes: 2 additions & 2 deletions NodeChrome/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM selenium/node-base:2.53.0
FROM selenium/node-base:2.53.1
MAINTAINER Selenium <selenium-developers@googlegroups.com>

USER root
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion NodeChromeDebug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM selenium/node-chrome:2.53.0
FROM selenium/node-chrome:2.53.1
MAINTAINER Selenium <selenium-developers@googlegroups.com>

USER root
Expand Down
13 changes: 8 additions & 5 deletions NodeChromeDebug/entry_point.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand All @@ -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 \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@addteq-andrew Same comment as above.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@addteq-himanshu I made the changes as per SeleniumHQ#238

${REMOTE_HOST_PARAM} \
-nodeConfig /opt/selenium/config.json \
${SE_OPTS} &
Expand Down
2 changes: 1 addition & 1 deletion NodeFirefox/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM selenium/node-base:2.53.0
FROM selenium/node-base:2.53.1
MAINTAINER Selenium <selenium-developers@googlegroups.com>

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeFirefoxDebug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM selenium/node-firefox:2.53.0
FROM selenium/node-firefox:2.53.1
MAINTAINER Selenium <selenium-developers@googlegroups.com>

USER root
Expand Down
13 changes: 8 additions & 5 deletions NodeFirefoxDebug/entry_point.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand All @@ -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} &
Expand Down