Skip to content

Commit 1921dac

Browse files
committed
Add support for specifying the Selenium version to use
1 parent 2da88aa commit 1921dac

File tree

10 files changed

+27
-12
lines changed

10 files changed

+27
-12
lines changed

Base/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN apt-get update -qqy \
2727
# Selenium
2828
#==========
2929
RUN mkdir -p /opt/selenium \
30-
&& 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
30+
&& wget --no-verbose https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar -O /opt/selenium/selenium-server-standalone-2.53.1.jar
31+
ENV SELENIUM_VERSION=2.53.1
3132

3233
#========================================
3334
# Add normal user with passwordless sudo

Hub/entry_point.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function shutdown {
1919
echo "shutdown complete"
2020
}
2121

22-
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
22+
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone-${SELENIUM_VERSION}.jar \
2323
-role hub \
2424
-hubConfig $CONF \
2525
${SE_OPTS} &

NodeBase/entry_point.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fi
3333

3434
SERVERNUM=$(get_server_num)
3535
xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
36-
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
36+
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone-${SELENIUM_VERSION}.jar \
3737
-role node \
3838
-hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
3939
${REMOTE_HOST_PARAM} \

NodeChromeDebug/entry_point.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ env | cut -f 1 -d "=" | sort > asroot
3838
$(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done) \
3939
DISPLAY=$DISPLAY \
4040
xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
41-
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
41+
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone-${SELENIUM_VERSION}.jar \
4242
-role node \
4343
-hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
4444
${REMOTE_HOST_PARAM} \

NodeFirefoxDebug/entry_point.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ env | cut -f 1 -d "=" | sort > asroot
3838
$(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done) \
3939
DISPLAY=$DISPLAY \
4040
xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
41-
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
41+
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone-${SELENIUM_VERSION}.jar \
4242
-role node \
4343
-hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
4444
${REMOTE_HOST_PARAM} \

README.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ Images included:
2121
- __selenium/node-firefox-debug__: Selenium node with Firefox installed and runs a VNC server, needs to be connected to a Selenium Grid Hub
2222

2323
## Running the images
24-
24+
2525
When executing docker run for an image with chrome browser please add volume mount `-v /dev/shm:/dev/shm` to use the host's shared memory.
2626

2727
``` bash
2828
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:2.53.1
2929
```
3030

31-
This is a workaround to node-chrome crash in docker container issue: https://code.google.com/p/chromium/issues/detail?id=519952
31+
This is a workaround to node-chrome crash in docker container issue: https://code.google.com/p/chromium/issues/detail?id=519952
3232

3333

3434
### Standalone Chrome and Firefox
@@ -56,6 +56,20 @@ $ docker run -d --link selenium-hub:hub selenium/node-chrome:2.53.1
5656
$ docker run -d --link selenium-hub:hub selenium/node-firefox:2.53.1
5757
```
5858

59+
### Specifying versions
60+
61+
By default the latest stable versions will be used, however you can override
62+
these using the following environment variables:
63+
64+
- `SELENIUM_VERSION` - version of the Selenium server
65+
66+
For example, the following will start a standalone Firefox server using
67+
Selenium 2.53.1:
68+
69+
```bash
70+
$ docker run -d -p 4444:4444 -e SELENIUM_VERSION=2.53.1 selenium/standalone-firefox:2.53.1
71+
```
72+
5973
### JAVA_OPTS Java Environment Options
6074

6175
You can pass `JAVA_OPTS` environment variable to java process.
@@ -135,7 +149,7 @@ $ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-de
135149

136150
to connect to the Chrome node on 5900 and the Firefox node on 5901 (assuming those node are free, and reachable).
137151

138-
And for standalone:
152+
And for standalone:
139153
``` bash
140154
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-chrome-debug:2.53.1
141155
# OR

Standalone/entry_point.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515

1616
SERVERNUM=$(get_server_num)
1717
xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
18-
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
18+
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone-${SELENIUM_VERSION}.jar \
1919
${SE_OPTS} &
2020
NODE_PID=$!
2121

StandaloneChrome/entry_point.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515

1616
SERVERNUM=$(get_server_num)
1717
xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
18-
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
18+
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone-${SELENIUM_VERSION}.jar \
1919
${SE_OPTS} &
2020
NODE_PID=$!
2121

StandaloneDebug/entry_point.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ sudo -E -i -u seluser \
2323
$(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done) \
2424
DISPLAY=$DISPLAY \
2525
xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
26-
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
26+
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone-${SELENIUM_VERSION}.jar \
2727
${SE_OPTS} &
2828
NODE_PID=$!
2929

StandaloneFirefox/entry_point.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515

1616
SERVERNUM=$(get_server_num)
1717
xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
18-
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
18+
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone-${SELENIUM_VERSION}.jar \
1919
${SE_OPTS} &
2020
NODE_PID=$!
2121

0 commit comments

Comments
 (0)