Skip to content

Commit ceb17d8

Browse files
committed
Merge pull request SeleniumHQ#168 from kayabendroth/maint/upgrade-selenium-to-2.52.0
Upgrade Selenium to version 2.52.0.
2 parents e5dfe85 + 9162737 commit ceb17d8

File tree

18 files changed

+44
-44
lines changed

18 files changed

+44
-44
lines changed

Base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN apt-get update -qqy \
2525
# Selenium
2626
#==========
2727
RUN mkdir -p /opt/selenium \
28-
&& wget --no-verbose http://selenium-release.storage.googleapis.com/2.50/selenium-server-standalone-2.50.1.jar -O /opt/selenium/selenium-server-standalone.jar
28+
&& wget --no-verbose http://selenium-release.storage.googleapis.com/2.52/selenium-server-standalone-2.52.0.jar -O /opt/selenium/selenium-server-standalone.jar
2929

3030
#========================================
3131
# Add normal user with passwordless sudo

Hub/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM selenium/base:2.50.1
1+
FROM selenium/base:2.52.0
22
MAINTAINER Selenium <[email protected]>
33

44
#========================

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME := selenium
2-
VERSION := $(or $(VERSION),$(VERSION),'2.50.1')
2+
VERSION := $(or $(VERSION),$(VERSION),'2.52.0')
33
PLATFORM := $(shell uname -s)
44
BUILD_ARGS := $(BUILD_ARGS)
55

NodeBase/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM selenium/base:2.50.1
1+
FROM selenium/base:2.52.0
22
MAINTAINER Selenium <[email protected]>
33

44
ENV DEBIAN_FRONTEND noninteractive

NodeChrome/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM selenium/node-base:2.50.1
1+
FROM selenium/node-base:2.52.0
22
MAINTAINER Selenium <[email protected]>
33

44
USER root

NodeChromeDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM selenium/node-chrome:2.50.1
1+
FROM selenium/node-chrome:2.52.0
22
MAINTAINER Selenium <[email protected]>
33

44
USER root

NodeChromeDebug/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
3838
When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
3939

4040
``` dockerfile
41-
FROM selenium/node-chrome-debug:2.50.1
41+
FROM selenium/node-chrome-debug:2.52.0
4242

4343
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
4444
```

NodeDebug/README.template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
3838
When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
3939

4040
``` dockerfile
41-
FROM selenium/##BASE##-debug:2.50.1
41+
FROM selenium/##BASE##-debug:2.52.0
4242

4343
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
4444
```

NodeFirefox/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM selenium/node-base:2.50.1
1+
FROM selenium/node-base:2.52.0
22
MAINTAINER Selenium <[email protected]>
33

44
USER root

NodeFirefoxDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM selenium/node-firefox:2.50.1
1+
FROM selenium/node-firefox:2.52.0
22
MAINTAINER Selenium <[email protected]>
33

44
USER root

NodeFirefoxDebug/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
3838
When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
3939

4040
``` dockerfile
41-
FROM selenium/node-firefox-debug:2.50.1
41+
FROM selenium/node-firefox-debug:2.52.0
4242

4343
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
4444
```

README.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Images included:
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
28-
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:2.50.1
28+
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:2.52.0
2929
```
3030

3131
This is a workaround to node-chrome crash in docker container issue: https://code.google.com/p/chromium/issues/detail?id=519952
@@ -34,9 +34,9 @@ This is a workaround to node-chrome crash in docker container issue: https://cod
3434
### Standalone Chrome and Firefox
3535

3636
``` bash
37-
$ docker run -d -p 4444:4444 selenium/standalone-chrome:2.50.1
37+
$ docker run -d -p 4444:4444 selenium/standalone-chrome:2.52.0
3838
# OR
39-
$ docker run -d -p 4444:4444 selenium/standalone-firefox:2.50.1
39+
$ docker run -d -p 4444:4444 selenium/standalone-firefox:2.52.0
4040
```
4141

4242
_Note: Only one standalone image can run on port_ `4444` _at a time._
@@ -46,30 +46,30 @@ To inspect visually what the browser is doing use the `standalone-chrome-debug`
4646
### Selenium Grid Hub
4747

4848
``` bash
49-
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:2.50.1
49+
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:2.52.0
5050
```
5151

5252
### Chrome and Firefox Grid Nodes
5353

5454
``` bash
55-
$ docker run -d --link selenium-hub:hub selenium/node-chrome:2.50.1
56-
$ docker run -d --link selenium-hub:hub selenium/node-firefox:2.50.1
55+
$ docker run -d --link selenium-hub:hub selenium/node-chrome:2.52.0
56+
$ docker run -d --link selenium-hub:hub selenium/node-firefox:2.52.0
5757
```
5858

5959
### JAVA_OPTS Java Environment Options
6060

6161
You can pass `JAVA_OPTS` environment variable to java process.
6262

6363
``` bash
64-
$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:2.50.1
64+
$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:2.52.0
6565
```
6666

6767
### SE_OPTS Selenium Configuration Options
6868

6969
You can pass `SE_OPTS` variable with additional commandline parameters for starting a hub or a node.
7070

7171
``` bash
72-
$ docker run -d -p 4444:4444 -e SE_OPTS=-debug --name selenium-hub selenium/hub:2.50.1
72+
$ docker run -d -p 4444:4444 -e SE_OPTS=-debug --name selenium-hub selenium/hub:2.52.0
7373
```
7474

7575
## Building the images
@@ -99,10 +99,10 @@ _Note: Omitting_ `VERSION=local` _will build the images with the current version
9999
##### Example: Spawn a container for testing in Chrome:
100100

101101
``` bash
102-
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.50.1
102+
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.52.0
103103
$ CH=$(docker run --rm --name=ch \
104104
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
105-
selenium/node-chrome:2.50.1)
105+
selenium/node-chrome:2.52.0)
106106
```
107107

108108
_Note:_ `-v /e2e/uploads:/e2e/uploads` _is optional in case you are testing browser uploads on your web app you will probably need to share a directory for this._
@@ -112,10 +112,10 @@ _Note:_ `-v /e2e/uploads:/e2e/uploads` _is optional in case you are testing brow
112112
This command line is the same as for Chrome. Remember that the Selenium running container is able to launch either Chrome or Firefox, the idea around having 2 separate containers, one for each browser is for convenience plus avoiding certain `:focus` issues your web app may encounter during end-to-end test automation.
113113

114114
``` bash
115-
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.50.1
115+
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.52.0
116116
$ FF=$(docker run --rm --name=fx \
117117
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
118-
selenium/node-firefox:2.50.1)
118+
selenium/node-firefox:2.52.0)
119119
```
120120

121121
_Note: Since a Docker container is not meant to preserve state and spawning a new one takes less than 3 seconds you will likely want to remove containers after each end-to-end test with_ `--rm` _command. You need to think of your Docker containers as single processes, not as running virtual machines, in case you are familiar with [Vagrant](https://www.vagrantup.com/)._
@@ -124,8 +124,8 @@ _Note: Since a Docker container is not meant to preserve state and spawning a ne
124124

125125
In the event you wish to visually see what the browser is doing you will want to run the `debug` variant of node or standalone images (substitute a free port that you wish to connect to on VNC for <port4VNC>; 5900 is fine if it is free, but of course you can only run one node on that port):
126126
``` bash
127-
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-chrome-debug:2.50.1
128-
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-firefox-debug:2.50.1
127+
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-chrome-debug:2.52.0
128+
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-firefox-debug:2.52.0
129129
```
130130
e.g.:
131131
``` bash
@@ -137,15 +137,15 @@ to connect to the Chrome node on 5900 and the Firefox node on 5901 (assuming tho
137137

138138
And for standalone:
139139
``` bash
140-
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-chrome-debug:2.50.1
140+
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-chrome-debug:2.52.0
141141
# OR
142-
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-firefox-debug:2.50.1
142+
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-firefox-debug:2.52.0
143143
```
144144
or
145145
``` bash
146-
$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:2.50.1
146+
$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:2.52.0
147147
# OR
148-
$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:2.50.1
148+
$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:2.52.0
149149
```
150150

151151
You can acquire the port that the VNC server is exposed to by running:
@@ -163,8 +163,8 @@ If you are running [Boot2Docker](https://docs.docker.com/installation/mac/) on O
163163

164164
When you are prompted for the password it is `secret`. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a Docker image that derives from the posted ones which reconfigures it:
165165
``` dockerfile
166-
#FROM selenium/node-chrome-debug:2.50.1
167-
#FROM selenium/node-firefox-debug:2.50.1
166+
#FROM selenium/node-chrome-debug:2.52.0
167+
#FROM selenium/node-firefox-debug:2.52.0
168168
#Choose the FROM statement that works for you.
169169

170170
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
@@ -176,11 +176,11 @@ RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
176176
$ docker images
177177
#=>
178178
REPOSITORY TAG IMAGE ID CREATED VIRTUAL SIZE
179-
selenium/node-firefox 2.50.1 69f762d0d79e 29 minutes ago 552.1 MB
180-
selenium/node-chrome 2.50.1 9dd73160660b 30 minutes ago 723.6 MB
181-
selenium/node-base 2.50.1 1b7a0b7024b1 32 minutes ago 426.1 MB
182-
selenium/hub 2.50.1 2570bbb98229 33 minutes ago 394.4 MB
183-
selenium/base 2.50.1 33478d455dab 33 minutes ago 362.6 MB
179+
selenium/node-firefox 2.52.0 69f762d0d79e 29 minutes ago 552.1 MB
180+
selenium/node-chrome 2.52.0 9dd73160660b 30 minutes ago 723.6 MB
181+
selenium/node-base 2.52.0 1b7a0b7024b1 32 minutes ago 426.1 MB
182+
selenium/hub 2.52.0 2570bbb98229 33 minutes ago 394.4 MB
183+
selenium/base 2.52.0 33478d455dab 33 minutes ago 362.6 MB
184184
ubuntu 15.04 013f3d01d247 6 days ago 131.4 MB
185185
```
186186

StandaloneChrome/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM selenium/node-chrome:2.50.1
1+
FROM selenium/node-chrome:2.52.0
22
MAINTAINER Selenium <[email protected]>
33

44
USER root

StandaloneChromeDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM selenium/standalone-chrome:2.50.1
1+
FROM selenium/standalone-chrome:2.52.0
22
MAINTAINER Selenium <[email protected]>
33

44
USER root

StandaloneFirefox/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM selenium/node-firefox:2.50.1
1+
FROM selenium/node-firefox:2.52.0
22
MAINTAINER Selenium <[email protected]>
33

44
USER root

StandaloneFirefoxDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM selenium/standalone-firefox:2.50.1
1+
FROM selenium/standalone-firefox:2.52.0
22
MAINTAINER Selenium <[email protected]>
33

44
USER root

sa-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function test_standalone {
1313
BROWSER=$1
1414
echo Starting Selenium standalone-$BROWSER$DEBUG container
1515

16-
SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:2.50.1)
16+
SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:2.52.0)
1717
SA_NAME=$(docker inspect -f '{{ .Name }}' $SA | sed s:/::)
1818
TEST_CMD="node smoke-$BROWSER.js"
1919

test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ echo Building test container image
99
docker build -t selenium/test:local ./Test
1010

1111
echo 'Starting Selenium Hub Container...'
12-
HUB=$(docker run -d selenium/hub:2.50.1)
12+
HUB=$(docker run -d selenium/hub:2.52.0)
1313
HUB_NAME=$(docker inspect -f '{{ .Name }}' $HUB | sed s:/::)
1414
echo 'Waiting for Hub to come online...'
1515
docker logs -f $HUB &
1616
sleep 2
1717

1818
echo 'Starting Selenium Chrome node...'
19-
NODE_CHROME=$(docker run -d --link $HUB_NAME:hub selenium/node-chrome$DEBUG:2.50.1)
19+
NODE_CHROME=$(docker run -d --link $HUB_NAME:hub selenium/node-chrome$DEBUG:2.52.0)
2020
echo 'Starting Selenium Firefox node...'
21-
NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:2.50.1)
21+
NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:2.52.0)
2222
docker logs -f $NODE_CHROME &
2323
docker logs -f $NODE_FIREFOX &
2424
echo 'Waiting for nodes to register and come online...'

0 commit comments

Comments
 (0)