Skip to content

Commit 07db943

Browse files
elgaluelgalu
committed
Merge pull request SeleniumHQ#44 from mgingras/master
selenium version bump to 2.45.0
2 parents 951caf2 + 9222066 commit 07db943

File tree

18 files changed

+40
-40
lines changed

18 files changed

+40
-40
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.44/selenium-server-standalone-2.44.0.jar -O /opt/selenium/selenium-server-standalone.jar
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
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.44.0
1+
FROM selenium/base:2.45.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.44.0')
2+
VERSION := $(or $(VERSION),$(VERSION),'2.45.0')
33
PLATFORM := $(shell uname -s)
44

55
all: hub chrome firefox chromedebug firefoxdebug standalone_chrome standalone_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.44.0
1+
FROM selenium/base:2.45.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.44.0
1+
FROM selenium/node-base:2.45.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.44.0
2-
#FROM selenium/node-*:2.44.0 Proper FROM attr will be applied throuh generate.sh
1+
FROM selenium/node-chrome:2.45.0
2+
#FROM selenium/node-*:2.45.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.44.0
41+
FROM selenium/node-chrome-debug:2.45.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.44.0 Proper FROM attr will be applied throuh generate.sh
1+
#FROM selenium/node-*:2.45.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.44.0
41+
FROM selenium/##BASE##-debug:2.45.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.44.0
1+
FROM selenium/node-base:2.45.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.44.0
2-
#FROM selenium/node-*:2.44.0 Proper FROM attr will be applied throuh generate.sh
1+
FROM selenium/node-firefox:2.45.0
2+
#FROM selenium/node-*:2.45.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.44.0
41+
FROM selenium/node-firefox-debug:2.45.0
4242

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

‎README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ Images included:
2222
### Standalone Chrome and Firefox
2323

2424
``` bash
25-
$ docker run -d -p 4444:4444 selenium/standalone-chrome:2.44.0
25+
$ docker run -d -p 4444:4444 selenium/standalone-chrome:2.45.0
2626
```
2727

2828
### Selenium Grid Hub
2929

3030
``` bash
31-
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:2.44.0
31+
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:2.45.0
3232
```
3333

3434
### Chrome and Firefox Nodes
3535

3636
``` bash
37-
$ docker run -d --link selenium-hub:hub selenium/node-chrome:2.44.0
38-
$ docker run -d --link selenium-hub:hub selenium/node-firefox:2.44.0
37+
$ docker run -d --link selenium-hub:hub selenium/node-chrome:2.45.0
38+
$ docker run -d --link selenium-hub:hub selenium/node-firefox:2.45.0
3939
```
4040

4141
## Building the images
@@ -59,10 +59,10 @@ _Note: omitting `VERSION=local` will build the images with the current version n
5959
##### e.g. Spawn a container for Chrome testing:
6060

6161
``` bash
62-
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.44.0
62+
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.45.0
6363
$ CH=$(docker run --rm --name=ch \
6464
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
65-
selenium/node-chrome:2.44.0)
65+
selenium/node-chrome:2.45.0)
6666
```
6767

6868
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.
@@ -74,19 +74,19 @@ I like to remove the containers after each e2e test with `--rm` since this docke
7474
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.
7575

7676
``` bash
77-
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.44.0
77+
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.45.0
7878
$ FF=$(docker run --rm --name=ch \
7979
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
80-
selenium/node-firefox:2.44.0)
80+
selenium/node-firefox:2.45.0)
8181
```
8282

8383
## Debugging
8484

8585
In the event you wish to visually see what the browser is doing you will want to run the selenium/node-chrome-debug and selenium/node-firefox-debug images.
8686

8787
``` bash
88-
$ docker run -d -P --link selenium-hub:hub selenium/node-chrome-debug:2.44.0
89-
$ docker run -d -P --link selenium-hub:hub selenium/node-firefox-debug:2.44.0
88+
$ docker run -d -P --link selenium-hub:hub selenium/node-chrome-debug:2.45.0
89+
$ docker run -d -P --link selenium-hub:hub selenium/node-firefox-debug:2.45.0
9090
```
9191

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

109109
``` dockerfile
110-
#FROM selenium/node-chrome-debug:2.44.0
111-
#FROM selenium/node-firefox-debug:2.44.0
110+
#FROM selenium/node-chrome-debug:2.45.0
111+
#FROM selenium/node-firefox-debug:2.45.0
112112
# Choose the FROM statement that works for you.
113113

114114
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
@@ -120,11 +120,11 @@ RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
120120
$ docker images
121121
#=>
122122
REPOSITORY TAG IMAGE ID CREATED VIRTUAL SIZE
123-
selenium/node-firefox 2.44.0 c7c0c99afabd 31 minutes ago 695.9 MB
124-
selenium/node-chrome 2.44.0 c4cd17423321 31 minutes ago 796.7 MB
125-
selenium/node-base 2.44.0 4f7c1788fe4c 32 minutes ago 584.8 MB
126-
selenium/hub 2.44.0 427462f54676 35 minutes ago 431.4 MB
127-
selenium/base 2.44.0 9126579ae96e 35 minutes ago 431.4 MB
123+
selenium/node-firefox 2.45.0 c7c0c99afabd 31 minutes ago 695.9 MB
124+
selenium/node-chrome 2.45.0 c4cd17423321 31 minutes ago 796.7 MB
125+
selenium/node-base 2.45.0 4f7c1788fe4c 32 minutes ago 584.8 MB
126+
selenium/hub 2.45.0 427462f54676 35 minutes ago 431.4 MB
127+
selenium/base 2.45.0 9126579ae96e 35 minutes ago 431.4 MB
128128
ubuntu 14.04 5506de2b643b 3 weeks ago 199.3 MB
129129
```
130130

‎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.44.0 Proper FROM attr will be applied throuh generate.sh
1+
#FROM selenium/node-*:2.45.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.44.0
2-
#FROM selenium/node-*:2.44.0 Proper FROM attr will be applied throuh generate.sh
1+
FROM selenium/node-chrome:2.45.0
2+
#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
33

44
USER root
55

‎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.44.0
2-
#FROM selenium/node-*:2.44.0 Proper FROM attr will be applied throuh generate.sh
1+
FROM selenium/node-firefox:2.45.0
2+
#FROM selenium/node-*:2.45.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
@@ -7,7 +7,7 @@ function test_standalone {
77
BROWSER=$1
88
echo Starting $BROWSER standalone container
99

10-
SA=$(docker run -d selenium/standalone-$BROWSER:2.44.0)
10+
SA=$(docker run -d selenium/standalone-$BROWSER:2.45.0)
1111
SA_NAME=$(docker inspect -f '{{ .Name }}' $SA | sed s:/::)
1212
TEST_CMD="node smoke-$BROWSER.js"
1313

‎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.44.0)
12+
HUB=$(docker run -d selenium/hub:2.45.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.44.0)
17-
NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:2.44.0)
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)
1818

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

0 commit comments

Comments
 (0)