Skip to content

Commit df9260e

Browse files
committed
s/1/2
1 parent 853239e commit df9260e

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

NodeChromeDebug/README.md

+1-1
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:3.1.0-actinium
41+
FROM selenium/node-chrome-debug:3.2.0-actinium
4242

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

NodeDebug/README.template.md

+1-1
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:3.1.0-actinium
41+
FROM selenium/##BASE##-debug:3.2.0-actinium
4242

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

NodeFirefoxDebug/Dockerfile.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM selenium/node-firefox:3.1.0-actinium
1+
FROM selenium/node-firefox:3.2.0-actinium
22
MAINTAINER Selenium <selenium-developers@googlegroups.com>
33

44
USER root

NodeFirefoxDebug/README.md

+1-1
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:3.1.0-actinium
41+
FROM selenium/node-firefox-debug:3.2.0-actinium
4242

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

README.md

+22-22
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Images included:
2626
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.
2727

2828
``` bash
29-
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.1.0-actinium
29+
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.2.0-actinium
3030
```
3131

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

3737
``` bash
38-
$ docker run -d -p 4444:4444 selenium/standalone-chrome:3.1.0-actinium
38+
$ docker run -d -p 4444:4444 selenium/standalone-chrome:3.2.0-actinium
3939
# OR
40-
$ docker run -d -p 4444:4444 selenium/standalone-firefox:3.1.0-actinium
40+
$ docker run -d -p 4444:4444 selenium/standalone-firefox:3.2.0-actinium
4141
```
4242

4343
_Note: Only one standalone image can run on port_ `4444` _at a time._
@@ -47,9 +47,9 @@ To inspect visually what the browser is doing use the `standalone-chrome-debug`
4747
### Selenium Grid Hub and Nodes
4848

4949
``` bash
50-
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.1.0-actinium
51-
$ docker run -d --link selenium-hub:hub selenium/node-chrome:3.1.0-actinium
52-
$ docker run -d --link selenium-hub:hub selenium/node-firefox:3.1.0-actinium
50+
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.2.0-actinium
51+
$ docker run -d --link selenium-hub:hub selenium/node-chrome:3.2.0-actinium
52+
$ docker run -d --link selenium-hub:hub selenium/node-firefox:3.2.0-actinium
5353
```
5454

5555
## Configuring the containers
@@ -59,15 +59,15 @@ $ docker run -d --link selenium-hub:hub selenium/node-firefox:3.1.0-actinium
5959
You can pass `JAVA_OPTS` environment variable to java process.
6060

6161
``` bash
62-
$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:3.1.0-actinium
62+
$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:3.2.0-actinium
6363
```
6464

6565
### SE_OPTS Selenium Configuration Options
6666

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

6969
``` bash
70-
$ docker run -d -p 4444:4444 -e SE_OPTS=-debug --name selenium-hub selenium/hub:3.1.0-actinium
70+
$ docker run -d -p 4444:4444 -e SE_OPTS=-debug --name selenium-hub selenium/hub:3.2.0-actinium
7171
```
7272

7373
### PHANTOMJS_OPTS PhantomJS Configuration Options
@@ -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:3.1.0-actinium
102+
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.2.0-actinium
103103
$ CH=$(docker run --rm --name=ch \
104104
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
105-
selenium/node-chrome:3.1.0-actinium)
105+
selenium/node-chrome:3.2.0-actinium)
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:3.1.0-actinium
115+
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.2.0-actinium
116116
$ FF=$(docker run --rm --name=fx \
117117
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
118-
selenium/node-firefox:3.1.0-actinium)
118+
selenium/node-firefox:3.2.0-actinium)
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,28 +124,28 @@ _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. A VNC server will run on port 5900. You are free to map that to any free external port that you wish. Example: <port4VNC>: 5900) you will only be able to run 1 node per port so if you wish to include a second node, or more, you will have to use different ports, the 5900 as the internal port will have to remain the same though as thats the VNC service on the node. The second example below shows how to run multiple nodes and with different VNC ports open:
126126
``` bash
127-
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.1.0-actinium
128-
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.1.0-actinium
127+
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.2.0-actinium
128+
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.2.0-actinium
129129
```
130130
e.g.:
131131
``` bash
132-
$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.1.0-actinium
133-
$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.1.0-actinium
132+
$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.2.0-actinium
133+
$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.2.0-actinium
134134
```
135135

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

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

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

165165
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:
166166
``` dockerfile
167-
#FROM selenium/node-chrome-debug:3.1.0-actinium
168-
#FROM selenium/node-firefox-debug:3.1.0-actinium
167+
#FROM selenium/node-chrome-debug:3.2.0-actinium
168+
#FROM selenium/node-firefox-debug:3.2.0-actinium
169169
#Choose the FROM statement that works for you.
170170

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

sa-test.sh

+1-1
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:3.1.0-actinium)
16+
SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:3.2.0-actinium)
1717
SA_NAME=$(docker inspect -f '{{ .Name }}' $SA | sed s:/::)
1818
TEST_CMD="node smoke-$BROWSER.js"
1919

test.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
DEBUG=''
3-
VERSION=${VERSION:-3.1.0-actinium}
3+
VERSION=${VERSION:-3.2.0-actinium}
44

55
if [ -n "$1" ] && [ $1 == 'debug' ]; then
66
DEBUG='-debug'
@@ -24,7 +24,7 @@ echo Building test container image
2424
docker build -t selenium/test:local ./Test
2525

2626
echo 'Starting Selenium Hub Container...'
27-
HUB=$(docker run -d selenium/hub:3.1.0-actinium)
27+
HUB=$(docker run -d selenium/hub:3.2.0-actinium)
2828
HUB_NAME=$(docker inspect -f '{{ .Name }}' $HUB | sed s:/::)
2929
echo 'Waiting for Hub to come online...'
3030
docker logs -f $HUB &

0 commit comments

Comments
 (0)