Skip to content

Commit

Permalink
Updating tags along docs and examples
Browse files Browse the repository at this point in the history
  • Loading branch information
diemol committed Nov 27, 2020
1 parent 6b980cd commit 9c3ca9d
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 78 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Expand Up @@ -41,7 +41,7 @@ Issues without a reproduction script are likely to stall and eventually be close
## Environment

OS: <!-- Windows 10? OSX? -->
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-alpha-7-20201119 etc
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-prerelease-beta-1-prerelease-20201127 etc
Also provide the docker image id
-->
Docker version:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.md
Expand Up @@ -41,7 +41,7 @@ Issues without a reproduction script are likely to stall and eventually be close
## Environment

OS: <!-- Windows 10? OSX? -->
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-alpha-7-20201119 etc
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-prerelease-beta-1-prerelease-20201127 etc
Also provide the docker image id
-->
Docker version:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/regression.md
Expand Up @@ -47,7 +47,7 @@ Issues without a reproduction script are likely to stall and eventually be close
## Environment

OS: <!-- Windows 10? OSX? -->
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-alpha-7-20201119 etc
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-prerelease-beta-1-prerelease-20201127 etc
Also provide the docker image id
-->
Docker version:
Expand Down
6 changes: 3 additions & 3 deletions NodeDocker/config.toml
Expand Up @@ -2,9 +2,9 @@
# Configs have a mapping between the Docker image to use and the capabilities that need to be matched to
# start a container with the given image.
configs = [
"selenium/standalone-firefox:4.0.0-alpha-7-20201119", "{\"browserName\": \"firefox\"}",
"selenium/standalone-chrome:4.0.0-alpha-7-20201119", "{\"browserName\": \"chrome\"}",
"selenium/standalone-opera:4.0.0-alpha-7-20201119", "{\"browserName\": \"operablink\"}"
"selenium/standalone-firefox:4.0.0-prerelease-beta-1-prerelease-20201127", "{\"browserName\": \"firefox\"}",
"selenium/standalone-chrome:4.0.0-prerelease-beta-1-prerelease-20201127", "{\"browserName\": \"chrome\"}",
"selenium/standalone-opera:4.0.0-prerelease-beta-1-prerelease-20201127", "{\"browserName\": \"operablink\"}"
]

# URL for connecting to the docker daemon
Expand Down
70 changes: 35 additions & 35 deletions README.md
Expand Up @@ -11,7 +11,7 @@ We are doing prereleases on a regular basis to get early feedback. This means th
can be currently at a different alpha version (e.g. bindings on Alpha 7, and Docker images on prerelease Beta 1).

Docker images for Grid 4 come with a handful of tags to simplify its usage, have a look at them in one of
our [prereleases](https://github.com/SeleniumHQ/docker-selenium/releases/tag/4.0.0-alpha-7-20201119)
our [prereleases](https://github.com/SeleniumHQ/docker-selenium/releases/tag/4.0.0-prerelease-beta-1-prerelease-20201127)

To get notifications of new prereleases, add yourself as a watcher of "Releases only".

Expand All @@ -31,9 +31,9 @@ https://www.selenium.dev/support/
1. Start a Docker container with Firefox

``` bash
$ docker run -d -p 4444:4444 --shm-size 2g selenium/standalone-firefox:4.0.0-alpha-7-20201119
$ docker run -d -p 4444:4444 --shm-size 2g selenium/standalone-firefox:4.0.0-prerelease-beta-1-prerelease-20201127
# OR
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:4.0.0-alpha-7-20201119
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:4.0.0-prerelease-beta-1-prerelease-20201127
```

2. Point your WebDriver tests to http://localhost:4444/wd/hub
Expand All @@ -60,17 +60,17 @@ ___

![Firefox](https://raw.githubusercontent.com/alrra/browser-logos/main/src/firefox/firefox_24x24.png) Firefox
``` bash
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:4.0.0-alpha-7-20201119
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:4.0.0-prerelease-beta-1-prerelease-20201127
```

![Chrome](https://raw.githubusercontent.com/alrra/browser-logos/main/src/chrome/chrome_24x24.png) Chrome
``` bash
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:4.0.0-alpha-7-20201119
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:4.0.0-prerelease-beta-1-prerelease-20201127
```

![Opera](https://raw.githubusercontent.com/alrra/browser-logos/main/src/opera/opera_24x24.png) Opera
``` bash
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-opera:4.0.0-alpha-7-20201119
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-opera:4.0.0-prerelease-beta-1-prerelease-20201127
```

_Note: Only one Standalone container can run on port_ `4444` _at the same time._
Expand All @@ -87,20 +87,20 @@ A Docker [network](https://docs.docker.com/engine/reference/commandline/network_

``` bash
$ docker network create grid
$ docker run -d -p 4442-4444:4442-4444 --net grid --name selenium-hub selenium/hub:4.0.0-alpha-7-20201119
$ docker run -d -p 4442-4444:4442-4444 --net grid --name selenium-hub selenium/hub:4.0.0-prerelease-beta-1-prerelease-20201127
$ docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub \
-e SE_EVENT_BUS_PUBLISH_PORT=4442 \
-e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \
-v /dev/shm:/dev/shm \
selenium/node-chrome:4.0.0-alpha-7-20201119
selenium/node-chrome:4.0.0-prerelease-beta-1-prerelease-20201127
$ docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub \
-e SE_EVENT_BUS_PUBLISH_PORT=4442 \
-e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \
-v /dev/shm:/dev/shm selenium/node-firefox:4.0.0-alpha-7-20201119
-v /dev/shm:/dev/shm selenium/node-firefox:4.0.0-prerelease-beta-1-prerelease-20201127
$ docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub \
-e SE_EVENT_BUS_PUBLISH_PORT=4442 \
-e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \
-v /dev/shm:/dev/shm selenium/node-opera:4.0.0-alpha-7-20201119
-v /dev/shm:/dev/shm selenium/node-opera:4.0.0-prerelease-beta-1-prerelease-20201127
```

When you are done using the Grid, and the containers have exited, the network can be removed with the following command:
Expand Down Expand Up @@ -139,7 +139,7 @@ ___

## Video recording ![BETA](https://img.shields.io/badge/beta!-blue?style=for-the-badge)

It is possible to record your tests running in containers by using the `selenium/video:ffmpeg-4.3.1-20201119`
It is possible to record your tests running in containers by using the `selenium/video:ffmpeg-4.3.1-20201127`
Docker image. One container is needed per each container where a browser is running. This means if you are
running 5 Nodes/Standalone containers, you will need 5 video containers, the mapping is 1-1.

Expand All @@ -165,8 +165,8 @@ This example shows how to start the containers manually:

``` bash
$ docker network create grid
$ docker run -d -p 4444:4444 -p 6900:5900 --net grid --name selenium -v /dev/shm:/dev/shm selenium/standalone-chrome:4.0.0-alpha-7-20201119
$ docker run -d --net grid --name video -v /tmp/videos:/videos selenium/video:ffmpeg-4.3.1-20201119
$ docker run -d -p 4444:4444 -p 6900:5900 --net grid --name selenium -v /dev/shm:/dev/shm selenium/standalone-chrome:4.0.0-prerelease-beta-1-prerelease-20201127
$ docker run -d --net grid --name video -v /tmp/videos:/videos selenium/video:ffmpeg-4.3.1-20201127
# Run your tests
$ docker stop video && docker rm video
$ docker stop selenium && docker rm selenium
Expand Down Expand Up @@ -197,9 +197,9 @@ You can save this file locally and name it, for example, `config.toml`.
# Configs have a mapping between the Docker image to use and the capabilities that need to be matched to
# start a container with the given image.
configs = [
"selenium/standalone-firefox:4.0.0-alpha-7-20201119", "{\"browserName\": \"firefox\"}",
"selenium/standalone-chrome:4.0.0-alpha-7-20201119", "{\"browserName\": \"chrome\"}",
"selenium/standalone-opera:4.0.0-alpha-7-20201119", "{\"browserName\": \"operablink\"}"
"selenium/standalone-firefox:4.0.0-prerelease-beta-1-prerelease-20201127", "{\"browserName\": \"firefox\"}",
"selenium/standalone-chrome:4.0.0-prerelease-beta-1-prerelease-20201127", "{\"browserName\": \"chrome\"}",
"selenium/standalone-opera:4.0.0-prerelease-beta-1-prerelease-20201127", "{\"browserName\": \"operablink\"}"
]

# URL for connecting to the docker daemon
Expand All @@ -209,7 +209,7 @@ configs = [
# socat -4 TCP-LISTEN:2375,fork UNIX-CONNECT:/var/run/docker.sock
host = "tcp://host.docker.internal:2375"
# Docker imagee used for video recording
video-image = "selenium/video:ffmpeg-4.3.1-20201119"
video-image = "selenium/video:ffmpeg-4.3.1-20201127"
# Absolute path where test assets will be stored (this path must exist on the host)
assets-path = "/assets/path/on/your/host/machine"
# Absolute path where test assets will be stored inside the container
Expand All @@ -226,13 +226,13 @@ virtual machines.

``` bash
$ docker network create grid
$ docker run -d -p 4442-4444:4442-4444 --net grid --name selenium-hub selenium/hub:4.0.0-alpha-7-20201119
$ docker run -d -p 4442-4444:4442-4444 --net grid --name selenium-hub selenium/hub:4.0.0-prerelease-beta-1-prerelease-20201127
$ docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub \
-e SE_EVENT_BUS_PUBLISH_PORT=4442 \
-e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \
-v ${PWD}/config.toml:/opt/bin/config.toml \
-v /path/on/your/host/machine:/opt/selenium/assets \
selenium/node-docker:4.0.0-alpha-7-20201119
selenium/node-docker:4.0.0-prerelease-beta-1-prerelease-20201127
```

When you are done using the Grid, and the containers have exited, the network can be removed with the following command:
Expand All @@ -248,7 +248,7 @@ $ docker network rm grid
docker run --rm -ti --name selenium-docker -p 4444:4444 \
-v ${PWD}/config.toml:/opt/bin/config.toml \
-v /path/on/your/host/machine:/opt/selenium/assets \
selenium/standalone-docker:4.0.0-alpha-7-20201119
selenium/standalone-docker:4.0.0-prerelease-beta-1-prerelease-20201127
```

### Video recording, screen resolution, and time zones in a Dynamic Grid
Expand Down Expand Up @@ -299,15 +299,15 @@ ___
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:4.0.0-alpha-7-20201119
$ docker run -d -p 4444:4444 -e SE_OPTS="-debug" --name selenium-hub selenium/hub:4.0.0-prerelease-beta-1-prerelease-20201127
```

### JAVA_OPTS Java Environment Options

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:4.0.0-alpha-7-20201119
$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:4.0.0-prerelease-beta-1-prerelease-20201127
```

### Node configuration options
Expand All @@ -323,7 +323,7 @@ variables.
Here is an example with the default values of these environment variables:

```bash
$ docker run -d --e SE_EVENT_BUS_HOST=<event_bus_ip|event_bus_name> -e SE_EVENT_BUS_PUBLISH_PORT=4442 -e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 -v /dev/shm:/dev/shm selenium/node-chrome:4.0.0-alpha-7-20201119
$ docker run -d --e SE_EVENT_BUS_HOST=<event_bus_ip|event_bus_name> -e SE_EVENT_BUS_PUBLISH_PORT=4442 -e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 -v /dev/shm:/dev/shm selenium/node-chrome:4.0.0-prerelease-beta-1-prerelease-20201127
```

### Setting Screen Resolution
Expand Down Expand Up @@ -378,11 +378,11 @@ current one._

``` bash
$ docker network create grid
$ docker run -d -p 4442-4444:4442-4444 --net grid --name selenium-hub selenium/hub:4.0.0-alpha-7-20201119
$ docker run -d -p 4442-4444:4442-4444 --net grid --name selenium-hub selenium/hub:4.0.0-prerelease-beta-1-prerelease-20201127
$ docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub \
-e SE_EVENT_BUS_PUBLISH_PORT=4442 -e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \
-v /dev/shm:/dev/shm \
-v /e2e/uploads:/e2e/uploads selenium/node-firefox:4.0.0-alpha-7-20201119
-v /e2e/uploads:/e2e/uploads selenium/node-firefox:4.0.0-prerelease-beta-1-prerelease-20201127
```

_Note:_ `-v /e2e/uploads:/e2e/uploads` _is optional in case you are testing browser uploads on your
Expand Down Expand Up @@ -463,10 +463,10 @@ $ docker network create grid
$ docker run -d -p 4444:4444 --net grid --name selenium-hub \
--health-cmd='/opt/bin/check-grid.sh --host 0.0.0.0 --port 4444' \
--health-interval=15s --health-timeout=30s --health-retries=5 \
selenium/hub:4.0.0-alpha-7-20201119
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-chrome:4.0.0-alpha-7-20201119
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-firefox:4.0.0-alpha-7-20201119
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-opera:4.0.0-alpha-7-20201119
selenium/hub:4.0.0-prerelease-beta-1-prerelease-20201127
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-chrome:4.0.0-prerelease-beta-1-prerelease-20201127
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-firefox:4.0.0-prerelease-beta-1-prerelease-20201127
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-opera:4.0.0-prerelease-beta-1-prerelease-20201127
```
**Note:** The `\` line delimiter won't work on Windows based terminals, try either `^` or a backtick.

Expand Down Expand Up @@ -530,9 +530,9 @@ running inside the container.

Here is an example with the standalone images, the same concept applies to the node images.
``` bash
$ docker run -d -p 4444:4444 -p 5900:5900 -v /dev/shm:/dev/shm selenium/standalone-chrome:4.0.0-alpha-7-20201119
$ docker run -d -p 4445:4444 -p 5901:5900 -v /dev/shm:/dev/shm selenium/standalone-firefox:4.0.0-alpha-7-20201119
$ docker run -d -p 4446:4444 -p 5902:5900 -v /dev/shm:/dev/shm selenium/standalone-opera:4.0.0-alpha-7-20201119
$ docker run -d -p 4444:4444 -p 5900:5900 -v /dev/shm:/dev/shm selenium/standalone-chrome:4.0.0-prerelease-beta-1-prerelease-20201127
$ docker run -d -p 4445:4444 -p 5901:5900 -v /dev/shm:/dev/shm selenium/standalone-firefox:4.0.0-prerelease-beta-1-prerelease-20201127
$ docker run -d -p 4446:4444 -p 5902:5900 -v /dev/shm:/dev/shm selenium/standalone-opera:4.0.0-prerelease-beta-1-prerelease-20201127
```

Then, you would use in your VNC client:
Expand All @@ -550,9 +550,9 @@ When you are prompted for the password it is `secret`. If you wish to change thi
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:4.0.0-alpha-7-20201119
#FROM selenium/node-firefox:4.0.0-alpha-7-20201119
#FROM selenium/node-opera:4.0.0-alpha-7-20201119
#FROM selenium/node-chrome:4.0.0-prerelease-beta-1-prerelease-20201127
#FROM selenium/node-firefox:4.0.0-prerelease-beta-1-prerelease-20201127
#FROM selenium/node-opera:4.0.0-prerelease-beta-1-prerelease-20201127
#Choose the FROM statement that works for you.

RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
Expand Down
6 changes: 3 additions & 3 deletions StandaloneDocker/config.toml
Expand Up @@ -2,9 +2,9 @@
# Configs have a mapping between the Docker image to use and the capabilities that need to be matched to
# start a container with the given image.
configs = [
"selenium/standalone-firefox:4.0.0-alpha-7-20201119", "{\"browserName\": \"firefox\"}",
"selenium/standalone-chrome:4.0.0-alpha-7-20201119", "{\"browserName\": \"chrome\"}",
"selenium/standalone-opera:4.0.0-alpha-7-20201119", "{\"browserName\": \"operablink\"}"
"selenium/standalone-firefox:4.0.0-prerelease-beta-1-prerelease-20201127", "{\"browserName\": \"firefox\"}",
"selenium/standalone-chrome:4.0.0-prerelease-beta-1-prerelease-20201127", "{\"browserName\": \"chrome\"}",
"selenium/standalone-opera:4.0.0-prerelease-beta-1-prerelease-20201127", "{\"browserName\": \"operablink\"}"
]

# URL for connecting to the docker daemon
Expand Down
8 changes: 4 additions & 4 deletions docker-compose-v2.yml
Expand Up @@ -4,7 +4,7 @@
version: '2'
services:
chrome:
image: selenium/node-chrome:4.0.0-alpha-7-20201119
image: selenium/node-chrome:4.0.0-prerelease-beta-1-prerelease-20201127
volumes:
- /dev/shm:/dev/shm
depends_on:
Expand All @@ -17,7 +17,7 @@ services:
- "6900:5900"

firefox:
image: selenium/node-firefox:4.0.0-alpha-7-20201119
image: selenium/node-firefox:4.0.0-prerelease-beta-1-prerelease-20201127
volumes:
- /dev/shm:/dev/shm
depends_on:
Expand All @@ -30,7 +30,7 @@ services:
- "6901:5900"

opera:
image: selenium/node-opera:4.0.0-alpha-7-20201119
image: selenium/node-opera:4.0.0-prerelease-beta-1-prerelease-20201127
volumes:
- /dev/shm:/dev/shm
depends_on:
Expand All @@ -43,7 +43,7 @@ services:
- "6902:5900"

selenium-hub:
image: selenium/hub:4.0.0-alpha-7-20201119
image: selenium/hub:4.0.0-prerelease-beta-1-prerelease-20201127
ports:
- "4442:4442"
- "4443:4443"
Expand Down
16 changes: 8 additions & 8 deletions docker-compose-v3-full-grid.yml
Expand Up @@ -4,15 +4,15 @@
version: "3"
services:
selenium-event-bus:
image: selenium/event-bus:4.0.0-alpha-7-20201119
image: selenium/event-bus:4.0.0-prerelease-beta-1-prerelease-20201127
container_name: selenium-event-bus
ports:
- "4442:4442"
- "4443:4443"
- "5557:5557"

selenium-sessions:
image: selenium/sessions:4.0.0-alpha-7-20201119
image: selenium/sessions:4.0.0-prerelease-beta-1-prerelease-20201127
container_name: selenium-sessions
ports:
- "5556:5556"
Expand All @@ -24,7 +24,7 @@ services:
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443

selenium-session-queuer:
image: selenium/session-queuer:4.0.0-alpha-7-20201119
image: selenium/session-queuer:4.0.0-prerelease-beta-1-prerelease-20201127
container_name: selenium-session-queuer
ports:
- "5559:5559"
Expand All @@ -36,7 +36,7 @@ services:
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443

selenium-distributor:
image: selenium/distributor:4.0.0-alpha-7-20201119
image: selenium/distributor:4.0.0-prerelease-beta-1-prerelease-20201127
container_name: selenium-distributor
ports:
- "5553:5553"
Expand All @@ -54,7 +54,7 @@ services:
- SE_SESSION_QUEUER_PORT=5559

selenium-router:
image: selenium/router:4.0.0-alpha-7-20201119
image: selenium/router:4.0.0-prerelease-beta-1-prerelease-20201127
container_name: selenium-router
ports:
- "4444:4444"
Expand All @@ -71,7 +71,7 @@ services:
- SE_SESSION_QUEUER_PORT=5559

chrome:
image: selenium/node-chrome:4.0.0-alpha-7-20201119
image: selenium/node-chrome:4.0.0-prerelease-beta-1-prerelease-20201127
volumes:
- /dev/shm:/dev/shm
depends_on:
Expand All @@ -84,7 +84,7 @@ services:
- "6900:5900"

firefox:
image: selenium/node-firefox:4.0.0-alpha-7-20201119
image: selenium/node-firefox:4.0.0-prerelease-beta-1-prerelease-20201127
volumes:
- /dev/shm:/dev/shm
depends_on:
Expand All @@ -97,7 +97,7 @@ services:
- "6901:5900"

opera:
image: selenium/node-opera:4.0.0-alpha-7-20201119
image: selenium/node-opera:4.0.0-prerelease-beta-1-prerelease-20201127
volumes:
- /dev/shm:/dev/shm
depends_on:
Expand Down

0 comments on commit 9c3ca9d

Please sign in to comment.