Skip to content

Commit 9f92a43

Browse files
committed
Upgrade to Selenium version 2.46.0.
1 parent 3731ee1 commit 9f92a43

File tree

20 files changed

+42
-42
lines changed

20 files changed

+42
-42
lines changed

Base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN apt-get update -qqy \
2424
# Selenium
2525
#==========
2626
RUN mkdir -p /opt/selenium \
27-
&& wget --no-verbose http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar -O /opt/selenium/selenium-server-standalone.jar
27+
&& wget --no-verbose http://selenium-release.storage.googleapis.com/2.46/selenium-server-standalone-2.46.0.jar -O /opt/selenium/selenium-server-standalone.jar
2828

2929
#========================================
3030
# 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.45.0
1+
FROM selenium/base:2.46.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.45.0')
2+
VERSION := $(or $(VERSION),$(VERSION),'2.46.0')
33
PLATFORM := $(shell uname -s)
44

55
all: hub chrome firefox chromedebug firefoxdebug standalone_chrome standalone_firefox standalone_debug_chrome standalone_debug_firefox

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.45.0
1+
FROM selenium/base:2.46.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.45.0
1+
FROM selenium/node-base:2.46.0
22
MAINTAINER Selenium <[email protected]>
33

44
USER root

NodeChromeDebug/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM selenium/node-chrome:2.45.0
2-
#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
1+
FROM selenium/node-chrome:2.46.0
2+
#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
33
MAINTAINER Selenium <[email protected]>
44

55
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.45.0
41+
FROM selenium/node-chrome-debug:2.46.0
4242

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

NodeDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
1+
#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
22
MAINTAINER Selenium <[email protected]>
33

44
USER root

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.45.0
41+
FROM selenium/##BASE##-debug:2.46.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.45.0
1+
FROM selenium/node-base:2.46.0
22
MAINTAINER Selenium <[email protected]>
33

44
USER root

NodeFirefoxDebug/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM selenium/node-firefox:2.45.0
2-
#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
1+
FROM selenium/node-firefox:2.46.0
2+
#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
33
MAINTAINER Selenium <[email protected]>
44

55
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.45.0
41+
FROM selenium/node-firefox-debug:2.46.0
4242

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

README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ Images included:
2626
### Standalone Chrome and Firefox
2727

2828
``` bash
29-
$ docker run -d -p 4444:4444 selenium/standalone-chrome:2.45.0
29+
$ docker run -d -p 4444:4444 selenium/standalone-chrome:2.46.0
3030
# OR
31-
$ docker run -d -p 4444:4444 selenium/standalone-firefox:2.45.0
31+
$ docker run -d -p 4444:4444 selenium/standalone-firefox:2.46.0
3232
```
3333

3434
Note: only one standalone image can run on port 4444 at a time.
@@ -38,14 +38,14 @@ To inspect visually what the browser is doing use the `standalone-chrome-debug`
3838
### Selenium Grid Hub
3939

4040
``` bash
41-
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:2.45.0
41+
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:2.46.0
4242
```
4343

4444
### Chrome and Firefox Nodes
4545

4646
``` bash
47-
$ docker run -d --link selenium-hub:hub selenium/node-chrome:2.45.0
48-
$ docker run -d --link selenium-hub:hub selenium/node-firefox:2.45.0
47+
$ docker run -d --link selenium-hub:hub selenium/node-chrome:2.46.0
48+
$ docker run -d --link selenium-hub:hub selenium/node-firefox:2.46.0
4949
```
5050

5151
## Building the images
@@ -69,10 +69,10 @@ _Note: omitting `VERSION=local` will build the images with the current version n
6969
##### e.g. Spawn a container for Chrome testing:
7070

7171
``` bash
72-
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.45.0
72+
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.46.0
7373
$ CH=$(docker run --rm --name=ch \
7474
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
75-
selenium/node-chrome:2.45.0)
75+
selenium/node-chrome:2.46.0)
7676
```
7777

7878
Note `-v /e2e/uploads:/e2e/uploads` is optional in case you are testing browser uploads on your webapp you'll probably need to share a directory for this.
@@ -84,27 +84,27 @@ I like to remove the containers after each e2e test with `--rm` since this docke
8484
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 avoid certain `:focus` issues you web app may encounter during e2e automation.
8585

8686
``` bash
87-
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.45.0
87+
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.46.0
8888
$ FF=$(docker run --rm --name=fx \
8989
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
90-
selenium/node-firefox:2.45.0)
90+
selenium/node-firefox:2.46.0)
9191
```
9292

9393
## Debugging
9494

9595
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.
9696

9797
``` bash
98-
$ docker run -d -P --link selenium-hub:hub selenium/node-chrome-debug:2.45.0
99-
$ docker run -d -P --link selenium-hub:hub selenium/node-firefox-debug:2.45.0
98+
$ docker run -d -P --link selenium-hub:hub selenium/node-chrome-debug:2.46.0
99+
$ docker run -d -P --link selenium-hub:hub selenium/node-firefox-debug:2.46.0
100100
```
101101

102102
And for standalone:
103103

104104
``` bash
105-
$ docker run -d -p 4444:4444 selenium/standalone-chrome-debug:2.45.0
105+
$ docker run -d -p 4444:4444 selenium/standalone-chrome-debug:2.46.0
106106
# OR
107-
$ docker run -d -p 4444:4444 selenium/standalone-firefox-debug:2.45.0
107+
$ docker run -d -p 4444:4444 selenium/standalone-firefox-debug:2.46.0
108108
```
109109

110110
You can acquire the port that the VNC server is exposed to by running:
@@ -125,8 +125,8 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
125125
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:
126126

127127
``` dockerfile
128-
#FROM selenium/node-chrome-debug:2.45.0
129-
#FROM selenium/node-firefox-debug:2.45.0
128+
#FROM selenium/node-chrome-debug:2.46.0
129+
#FROM selenium/node-firefox-debug:2.46.0
130130
# Choose the FROM statement that works for you.
131131

132132
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd

Standalone/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
1+
#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
22

33
USER root
44

StandaloneChrome/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM selenium/node-chrome:2.45.0
2-
#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
1+
FROM selenium/node-chrome:2.46.0
2+
#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
33

44
USER root
55

StandaloneDebugChrome/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM selenium/standalone-chrome:2.45.0
2-
#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
1+
FROM selenium/standalone-chrome:2.46.0
2+
#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
33
MAINTAINER Selenium <[email protected]>
44

55
USER root

StandaloneDebugFirefox/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM selenium/standalone-firefox:2.45.0
2-
#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
1+
FROM selenium/standalone-firefox:2.46.0
2+
#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
33
MAINTAINER Selenium <[email protected]>
44

55
USER root

StandaloneFirefox/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM selenium/node-firefox:2.45.0
2-
#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
1+
FROM selenium/node-firefox:2.46.0
2+
#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
33

44
USER root
55

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.45.0)
16+
SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:2.46.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,12 +9,12 @@ echo Building test container image
99
docker build -t selenium/test:local ./Test
1010

1111
echo Starting Selenium Container
12-
HUB=$(docker run -d selenium/hub:2.45.0)
12+
HUB=$(docker run -d selenium/hub:2.46.0)
1313
HUB_NAME=$(docker inspect -f '{{ .Name }}' $HUB | sed s:/::)
1414
sleep 2
1515

16-
NODE_CHROME=$(docker run -d --link $HUB_NAME:hub selenium/node-chrome$DEBUG:2.45.0)
17-
NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:2.45.0)
16+
NODE_CHROME=$(docker run -d --link $HUB_NAME:hub selenium/node-chrome$DEBUG:2.46.0)
17+
NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:2.46.0)
1818

1919
docker logs -f $HUB &
2020
docker logs -f $NODE_CHROME &

0 commit comments

Comments
 (0)