Skip to content

Commit

Permalink
3.10.0-argon release
Browse files Browse the repository at this point in the history
  • Loading branch information
diemol committed Mar 3, 2018
1 parent c39dbbd commit 55704a3
Show file tree
Hide file tree
Showing 16 changed files with 50 additions and 50 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.9.1-actinium etc -->
<!-- 3, 3.4, 3.10.0-argon etc -->
Docker Version:
<!-- 17.09.0-ce, 17.06.2-ce etc -->
OS:
Expand Down
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.9.1-actinium
FROM selenium/base:3.10.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.9.1-actinium)
VERSION := $(or $(VERSION),$(VERSION),3.10.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.9.1-actinium
FROM selenium/base:3.10.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.9.1-actinium
FROM selenium/node-base:3.10.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.9.1-actinium
FROM selenium/node-chrome:3.10.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 @@ -37,7 +37,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.9.1-actinium
FROM selenium/node-chrome-debug:3.10.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 @@ -37,7 +37,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.9.1-actinium
FROM selenium/##BASE##-debug:3.10.0-argon

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

USER root

#=========
# Firefox
#=========
ARG FIREFOX_VERSION=58.0.1
RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "nightly" ]; then echo "https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=linux64&lang=en-US"; else echo "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2"; fi) \
ARG FIREFOX_VERSION=58.0.2
RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "nightly" ] || [ $FIREFOX_VERSION = "devedition" ]; then echo "https://download.mozilla.org/?product=firefox-$FIREFOX_VERSION-latest-ssl&os=linux64&lang=en-US"; else echo "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2"; fi) \
&& apt-get update -qqy \
&& apt-get -qqy --no-install-recommends install firefox \
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
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.9.1-actinium
FROM selenium/node-firefox:3.10.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 @@ -37,7 +37,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.9.1-actinium
FROM selenium/node-firefox-debug:3.10.0-argon

RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
```
Expand Down
66 changes: 33 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ Images included:

Chrome
``` bash
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.9.1-actinium
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.10.0-argon
#OR
$ docker run -d -p 4444:4444 --shm-size=2g selenium/standalone-chrome:3.9.1-actinium
$ docker run -d -p 4444:4444 --shm-size=2g selenium/standalone-chrome:3.10.0-argon
```
Firefox
``` bash
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:3.9.1-actinium
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:3.10.0-argon
#OR
$ docker run -d -p 4444:4444 --shm-size 2g selenium/standalone-firefox:3.9.1-actinium
$ docker run -d -p 4444:4444 --shm-size 2g selenium/standalone-firefox:3.10.0-argon
```
This is a known workaround to avoid the browser crashing inside a docker container, here are the documented issues for
[Chrome](https://code.google.com/p/chromium/issues/detail?id=519952) and [Firefox](https://bugzilla.mozilla.org/show_bug.cgi?id=1338771#c10).
Expand All @@ -50,9 +50,9 @@ to tune this value according to your needs. Along the examples `-v /dev/shm:/dev
### Standalone Chrome and Firefox

``` bash
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.9.1-actinium
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.10.0-argon
# OR
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:3.9.1-actinium
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:3.10.0-argon
```

_Note: Only one standalone image can run on port_ `4444` _at a time._
Expand All @@ -68,9 +68,9 @@ A docker [network](https://docs.docker.com/engine/reference/commandline/network_

``` bash
$ docker network create grid
$ docker run -d -p 4444:4444 --net grid --name selenium-hub selenium/hub:3.9.1-actinium
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-chrome:3.9.1-actinium
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-firefox:3.9.1-actinium
$ docker run -d -p 4444:4444 --net grid --name selenium-hub selenium/hub:3.10.0-argon
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-chrome:3.10.0-argon
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-firefox:3.10.0-argon
```

When you are done using the grid and the containers have exited, the network can be removed with the following command:
Expand All @@ -93,7 +93,7 @@ snippet as your `docker-compose.yaml`, save it locally and in the same folder ru
version: '2'
services:
firefox:
image: selenium/node-firefox:3.9.1-actinium
image: selenium/node-firefox:3.10.0-argon
volumes:
- /dev/shm:/dev/shm
depends_on:
Expand All @@ -102,7 +102,7 @@ services:
HUB_HOST: hub

chrome:
image: selenium/node-chrome:3.9.1-actinium
image: selenium/node-chrome:3.10.0-argon
volumes:
- /dev/shm:/dev/shm
depends_on:
Expand All @@ -111,7 +111,7 @@ services:
HUB_HOST: hub

hub:
image: selenium/hub:3.9.1-actinium
image: selenium/hub:3.10.0-argon
ports:
- "4444:4444"
```
Expand All @@ -124,9 +124,9 @@ for longer term usage since this is a docker [legacy feature](https://docs.docke
It could serve you as an option for a proof of concept, and for simplicity it is used in the examples shown from now on.

``` bash
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.9.1-actinium
$ docker run -d --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-chrome:3.9.1-actinium
$ docker run -d --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-firefox:3.9.1-actinium
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.10.0-argon
$ docker run -d --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-chrome:3.10.0-argon
$ docker run -d --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-firefox:3.10.0-argon
```

## Configuring the containers
Expand All @@ -136,15 +136,15 @@ $ docker run -d --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-firef
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.9.1-actinium
$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:3.10.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" --name selenium-hub selenium/hub:3.9.1-actinium
$ docker run -d -p 4444:4444 -e SE_OPTS="-debug" --name selenium-hub selenium/hub:3.10.0-argon
```

### Selenium Hub and Node Configuration options
Expand All @@ -156,15 +156,15 @@ You can pass the `HUB_HOST` and `HUB_PORT` options to provide the hub address to

``` bash
# Assuming a hub was already started
$ docker run -d -e HUB_HOST=<hub_ip|hub_name> -e HUB_PORT=4444 selenium/node-chrome:3.9.1-actinium
$ docker run -d -e HUB_HOST=<hub_ip|hub_name> -e HUB_PORT=4444 selenium/node-chrome:3.10.0-argon
```

Some network topologies might prevent the hub to reach the node through the url given at registration time, `REMOTE_HOST`
can be used to supply the hub a url where the node is reachable under your specific network configuration

``` bash
# Assuming a hub was already started
$ docker run -d -e HUB_HOST=<hub_ip|hub_name> -e REMOTE_HOST="http://node_ip|node_name:node_port" selenium/node-firefox:3.9.1-actinium
$ docker run -d -e HUB_HOST=<hub_ip|hub_name> -e REMOTE_HOST="http://node_ip|node_name:node_port" selenium/node-firefox:3.10.0-argon
```

## Building the images
Expand All @@ -188,11 +188,11 @@ _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.9.1-actinium
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.10.0-argon
$ CH=$(docker run --rm --name=ch \
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
-v /dev/shm:/dev/shm \
selenium/node-chrome:3.9.1-actinium)
selenium/node-chrome:3.10.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 @@ -202,11 +202,11 @@ _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.9.1-actinium
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.10.0-argon
$ FF=$(docker run --rm --name=fx \
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
-v /dev/shm:/dev/shm \
selenium/node-firefox:3.9.1-actinium)
selenium/node-firefox:3.10.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 @@ -215,27 +215,27 @@ _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. Keep in mind that you will only be able to run one 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 -v /dev/shm:/dev/shm selenium/node-chrome-debug:3.9.1-actinium
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-firefox-debug:3.9.1-actinium
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-chrome-debug:3.10.0-argon
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-firefox-debug:3.10.0-argon
```
e.g.:
``` bash
$ docker run -d -P -p 5900:5900 --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-chrome-debug:3.9.1-actinium
$ docker run -d -P -p 5901:5900 --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-firefox-debug:3.9.1-actinium
$ docker run -d -P -p 5900:5900 --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-chrome-debug:3.10.0-argon
$ docker run -d -P -p 5901:5900 --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-firefox-debug:3.10.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 -v /dev/shm:/dev/shm selenium/standalone-chrome-debug:3.9.1-actinium
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 -v /dev/shm:/dev/shm selenium/standalone-chrome-debug:3.10.0-argon
# OR
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 -v /dev/shm:/dev/shm selenium/standalone-firefox-debug:3.9.1-actinium
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 -v /dev/shm:/dev/shm selenium/standalone-firefox-debug:3.10.0-argon
```
or
``` bash
$ docker run -d -p 4444:4444 -p 5900:5900 -v /dev/shm:/dev/shm selenium/standalone-chrome-debug:3.9.1-actinium
$ docker run -d -p 4444:4444 -p 5900:5900 -v /dev/shm:/dev/shm selenium/standalone-chrome-debug:3.10.0-argon
# OR
$ docker run -d -p 4444:4444 -p 5901:5900 -v /dev/shm:/dev/shm selenium/standalone-firefox-debug:3.9.1-actinium
$ docker run -d -p 4444:4444 -p 5901:5900 -v /dev/shm:/dev/shm selenium/standalone-firefox-debug:3.10.0-argon
```

You can acquire the port that the VNC server is exposed to by running:
Expand All @@ -254,8 +254,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.9.1-actinium
#FROM selenium/node-firefox-debug:3.9.1-actinium
#FROM selenium/node-chrome-debug:3.10.0-argon
#FROM selenium/node-firefox-debug:3.10.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.9.1-actinium
FROM selenium/node-chrome:3.10.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.9.1-actinium
FROM selenium/node-chrome-debug:3.10.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.9.1-actinium
FROM selenium/node-firefox:3.10.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.9.1-actinium
FROM selenium/node-firefox-debug:3.10.0-argon
LABEL authors=SeleniumHQ

USER seluser
Expand Down

0 comments on commit 55704a3

Please sign in to comment.