Skip to content

Commit

Permalink
update to 3.5.0-argon
Browse files Browse the repository at this point in the history
  • Loading branch information
ddavison committed Aug 28, 2017
1 parent 013d749 commit 0119b3b
Show file tree
Hide file tree
Showing 20 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Image(s):
<!-- node-chrome? hub? standalone-firefox? -->
Docker-Selenium Image Version(s):
<!-- 3, 3.4, 3.4.0-francium etc -->
<!-- 3, 3.4, 3.5.0-argon etc -->
OS:
<!-- Windows 10, OSX Yosemite, Centos6, etc -->

Expand Down
2 changes: 1 addition & 1 deletion Base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ USER seluser
#==========
RUN sudo mkdir -p /opt/selenium \
&& sudo chown seluser:seluser /opt/selenium \
&& wget --no-verbose https://selenium-release.storage.googleapis.com/3.4/selenium-server-standalone-3.4.0.jar \
&& wget --no-verbose https://selenium-release.storage.googleapis.com/3.5/selenium-server-standalone-3.5.0.jar \
-O /opt/selenium/selenium-server-standalone.jar

2 changes: 1 addition & 1 deletion Hub/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/base:3.4.0-francium
FROM selenium/base:3.5.0-argon
LABEL authors=SeleniumHQ

USER seluser
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NAME := selenium
VERSION := $(or $(VERSION),$(VERSION),3.4.0-francium)
VERSION := $(or $(VERSION),$(VERSION),3.5.0-argon)
NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
AUTHORS := $(or $(AUTHORS),$(AUTHORS),SeleniumHQ)
PLATFORM := $(shell uname -s)
Expand Down
2 changes: 1 addition & 1 deletion NodeBase/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/base:3.4.0-francium
FROM selenium/base:3.5.0-argon
LABEL authors=SeleniumHQ

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeChrome/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-base:3.4.0-francium
FROM selenium/node-base:3.5.0-argon
LABEL authors=SeleniumHQ

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeChromeDebug/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-chrome:3.4.0-francium
FROM selenium/node-chrome:3.5.0-argon
LABEL authors=SeleniumHQ

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeChromeDebug/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
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:

``` dockerfile
FROM selenium/node-chrome-debug:3.4.0-francium
FROM selenium/node-chrome-debug:3.5.0-argon

RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
```
Expand Down
2 changes: 1 addition & 1 deletion NodeDebug/README.template.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
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:

``` dockerfile
FROM selenium/##BASE##-debug:3.4.0-francium
FROM selenium/##BASE##-debug:3.5.0-argon

RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
```
Expand Down
2 changes: 1 addition & 1 deletion NodeFirefox/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-base:3.4.0-francium
FROM selenium/node-base:3.5.0-argon
LABEL authors=SeleniumHQ

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeFirefoxDebug/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-firefox:3.4.0-francium
FROM selenium/node-firefox:3.5.0-argon
LABEL authors=SeleniumHQ

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeFirefoxDebug/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
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:

``` dockerfile
FROM selenium/node-firefox-debug:3.4.0-francium
FROM selenium/node-firefox-debug:3.5.0-argon

RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
```
Expand Down
2 changes: 1 addition & 1 deletion NodePhantomJS/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-base:3.4.0-francium
FROM selenium/node-base:3.5.0-argon
LABEL authors=SeleniumHQ

USER root
Expand Down
50 changes: 25 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ Images included:
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.

``` bash
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.4.0-francium
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.5.0-argon
```

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

When executing docker run for an image with firefox browser please set shm-size to 2g.

``` bash
$ docker run -d -p 4444:4444 --shm-size 2g selenium/standalone-firefox:3.4.0-francium
$ docker run -d -p 4444:4444 --shm-size 2g selenium/standalone-firefox:3.5.0-argon
```

This is a workaround to node-firefox crash in docker container issue: https://bugzilla.mozilla.org/show_bug.cgi?id=1338771#c10
Expand All @@ -49,9 +49,9 @@ This is a workaround to node-firefox crash in docker container issue: https://bu
### Standalone Chrome and Firefox

``` bash
$ docker run -d -p 4444:4444 selenium/standalone-chrome:3.4.0-francium
$ docker run -d -p 4444:4444 selenium/standalone-chrome:3.5.0-argon
# OR
$ docker run -d -p 4444:4444 selenium/standalone-firefox:3.4.0-francium
$ docker run -d -p 4444:4444 selenium/standalone-firefox:3.5.0-argon
```

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

``` bash
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.4.0-francium
$ docker run -d --link selenium-hub:hub selenium/node-chrome:3.4.0-francium
$ docker run -d --link selenium-hub:hub selenium/node-firefox:3.4.0-francium
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.5.0-argon
$ docker run -d --link selenium-hub:hub selenium/node-chrome:3.5.0-argon
$ docker run -d --link selenium-hub:hub selenium/node-firefox:3.5.0-argon
```

## Configuring the containers
Expand All @@ -73,15 +73,15 @@ $ docker run -d --link selenium-hub:hub selenium/node-firefox:3.4.0-francium
You can pass `JAVA_OPTS` environment variable to java process.

``` bash
$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:3.4.0-francium
$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:3.5.0-argon
```

### SE_OPTS Selenium Configuration Options

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

``` bash
$ docker run -d -p 4444:4444 -e SE_OPTS="-debug true" --name selenium-hub selenium/hub:3.4.0-francium
$ docker run -d -p 4444:4444 -e SE_OPTS="-debug true" --name selenium-hub selenium/hub:3.5.0-argon
```

### HUB_PORT_4444_TCP_ADDR and HUB_PORT_4444_TCP_PORT Selenium Node Configuration options
Expand All @@ -90,13 +90,13 @@ You can pass `HUB_PORT_4444_TCP_ADDR` and `HUB_PORT_4444_TCP_PORT` options to pr

``` bash
$ docker run -d -p 4444:4444 -e HUB_PORT_4444_TCP_ADDR=10.10.1.10 -e HUB_PORT_4444_TCP_PORT=4444 \
--name selenium-hub selenium/hub:3.4.0-francium
--name selenium-hub selenium/hub:3.5.0-argon
```

### PHANTOMJS_OPTS PhantomJS Configuration Options

``` bash
$ docker run -d -e PHANTOMJS_OPTS="--ignore-ssl-errors=true" --link selenium-hub:hub selenium/node-phantomjs:3.4.0-francium
$ docker run -d -e PHANTOMJS_OPTS="--ignore-ssl-errors=true" --link selenium-hub:hub selenium/node-phantomjs:3.5.0-argon
```

You can pass `SE_OPTS` variable with additional commandline parameters for starting a PhantomJS node.
Expand All @@ -122,10 +122,10 @@ _Note: Omitting_ `VERSION=local` _will build the images with the current version
##### Example: Spawn a container for testing in Chrome:

``` bash
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.4.0-francium
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.5.0-argon
$ CH=$(docker run --rm --name=ch \
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
selenium/node-chrome:3.4.0-francium)
selenium/node-chrome:3.5.0-argon)
```

_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._
Expand All @@ -135,10 +135,10 @@ _Note:_ `-v /e2e/uploads:/e2e/uploads` _is optional in case you are testing brow
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.

``` bash
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.4.0-francium
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.5.0-argon
$ FF=$(docker run --rm --name=fx \
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
selenium/node-firefox:3.4.0-francium)
selenium/node-firefox:3.5.0-argon)
```

_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/)._
Expand All @@ -147,28 +147,28 @@ _Note: Since a Docker container is not meant to preserve state and spawning a ne

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:
``` bash
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.4.0-francium
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.4.0-francium
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.5.0-argon
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.5.0-argon
```
e.g.:
``` bash
$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.4.0-francium
$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.4.0-francium
$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.5.0-argon
$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.5.0-argon
```

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

And for standalone:
``` bash
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-chrome-debug:3.4.0-francium
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-chrome-debug:3.5.0-argon
# OR
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-firefox-debug:3.4.0-francium
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-firefox-debug:3.5.0-argon
```
or
``` bash
$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:3.4.0-francium
$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:3.5.0-argon
# OR
$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:3.4.0-francium
$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:3.5.0-argon
```

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

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:
``` dockerfile
#FROM selenium/node-chrome-debug:3.4.0-francium
#FROM selenium/node-firefox-debug:3.4.0-francium
#FROM selenium/node-chrome-debug:3.5.0-argon
#FROM selenium/node-firefox-debug:3.5.0-argon
#Choose the FROM statement that works for you.

RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
Expand Down
2 changes: 1 addition & 1 deletion StandaloneChrome/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-chrome:3.4.0-francium
FROM selenium/node-chrome:3.5.0-argon
LABEL authors=SeleniumHQ

USER seluser
Expand Down
2 changes: 1 addition & 1 deletion StandaloneChromeDebug/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-chrome-debug:3.4.0-francium
FROM selenium/node-chrome-debug:3.5.0-argon
LABEL authors=SeleniumHQ

USER seluser
Expand Down
2 changes: 1 addition & 1 deletion StandaloneFirefox/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-firefox:3.4.0-francium
FROM selenium/node-firefox:3.5.0-argon
LABEL authors=SeleniumHQ

USER seluser
Expand Down
2 changes: 1 addition & 1 deletion StandaloneFirefoxDebug/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-firefox-debug:3.4.0-francium
FROM selenium/node-firefox-debug:3.5.0-argon
LABEL authors=SeleniumHQ

USER seluser
Expand Down
2 changes: 1 addition & 1 deletion sa-test.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

DEBUG=''
VERSION=${VERSION:-3.4.0-francium}
VERSION=${VERSION:-3.5.0-argon}

if [ -n "$1" ] && [ $1 == 'debug' ]; then
DEBUG='-debug'
Expand Down
2 changes: 1 addition & 1 deletion test.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
DEBUG=''
VERSION=${VERSION:-3.4.0-francium}
VERSION=${VERSION:-3.5.0-argon}

if [ -n "$1" ] && [ $1 == 'debug' ]; then
DEBUG='-debug'
Expand Down

1 comment on commit 0119b3b

@westy92
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were you supposed to update Dockerfile.txt instead of Dockerfile?

Please sign in to comment.