Skip to content

Commit

Permalink
Update tag in docs and files [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
selenium-ci committed Sep 21, 2020
1 parent 1a3b0e1 commit 0688f01
Show file tree
Hide file tree
Showing 21 changed files with 73 additions and 68 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-prerelease-20200907 etc
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-alpha-7-prerelease-20200921 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-prerelease-20200907 etc
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-alpha-7-prerelease-20200921 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-prerelease-20200907 etc
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-alpha-7-prerelease-20200921 etc
Also provide the docker image id
-->
Docker version:
Expand Down
2 changes: 1 addition & 1 deletion Distributor/Dockerfile
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:4.0.0-alpha-7-prerelease-20200907
FROM selenium/base:4.0.0-alpha-7-prerelease-20200921
LABEL authors=SeleniumHQ

USER 1200
Expand Down
2 changes: 1 addition & 1 deletion EventBus/Dockerfile
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:4.0.0-alpha-7-prerelease-20200907
FROM selenium/base:4.0.0-alpha-7-prerelease-20200921
LABEL authors=SeleniumHQ

USER 1200
Expand Down
2 changes: 1 addition & 1 deletion Hub/Dockerfile
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:4.0.0-alpha-7-prerelease-20200907
FROM selenium/base:4.0.0-alpha-7-prerelease-20200921
LABEL authors=SeleniumHQ

USER 1200
Expand Down
11 changes: 8 additions & 3 deletions NodeBase/Dockerfile
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:4.0.0-alpha-7-prerelease-20200907
FROM selenium/base:4.0.0-alpha-7-prerelease-20200921
LABEL authors=SeleniumHQ

USER root
Expand Down Expand Up @@ -124,10 +124,14 @@ RUN sudo chmod -R 777 ${HOME} \
#==============================
# Scripts to run fluxbox and x11vnc
#==============================
COPY start-fluxbox.sh \
start-vnc.sh \
COPY start-vnc.sh \
/opt/bin/

#==============================
# Selenium Grid logo as wallpaper for Fluxbox
#==============================
COPY selenium_grid_logo.png /usr/share/images/fluxbox/ubuntu-light.png

#============================
# Some configuration options
#============================
Expand All @@ -136,6 +140,7 @@ ENV SCREEN_HEIGHT 1020
ENV SCREEN_DEPTH 24
ENV SCREEN_DPI 96
ENV DISPLAY :99.0
ENV DISPLAY_NUM 99
ENV START_XVFB true

#========================
Expand Down
2 changes: 1 addition & 1 deletion NodeChrome/Dockerfile
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:4.0.0-alpha-7-prerelease-20200907
FROM selenium/node-base:4.0.0-alpha-7-prerelease-20200921
LABEL authors=SeleniumHQ

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeFirefox/Dockerfile
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:4.0.0-alpha-7-prerelease-20200907
FROM selenium/node-base:4.0.0-alpha-7-prerelease-20200921
LABEL authors=SeleniumHQ

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeOpera/Dockerfile
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:4.0.0-alpha-7-prerelease-20200907
FROM selenium/node-base:4.0.0-alpha-7-prerelease-20200921
LABEL authors=SeleniumHQ

USER root
Expand Down
54 changes: 27 additions & 27 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 6, and these Docker images on prerelease Alpha 7).

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-prerelease-20200907)
our [prereleases](https://github.com/SeleniumHQ/docker-selenium/releases/tag/4.0.0-alpha-7-prerelease-20200921)

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-prerelease-20200907
$ docker run -d -p 4444:4444 --shm-size 2g selenium/standalone-firefox:4.0.0-alpha-7-prerelease-20200921
# OR
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:4.0.0-alpha-7-prerelease-20200907
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:4.0.0-alpha-7-prerelease-20200921
```

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-prerelease-20200907
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:4.0.0-alpha-7-prerelease-20200921
```

![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-prerelease-20200907
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:4.0.0-alpha-7-prerelease-20200921
```

![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-prerelease-20200907
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-opera:4.0.0-alpha-7-prerelease-20200921
```

_Note: Only one Standalone container can run on port_ `4444` _at the same time._
Expand All @@ -87,10 +87,10 @@ 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-prerelease-20200907
$ 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-prerelease-20200907
$ 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-prerelease-20200907
$ 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-prerelease-20200907
$ docker run -d -p 4442-4444:4442-4444 --net grid --name selenium-hub selenium/hub:4.0.0-alpha-7-prerelease-20200921
$ 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-prerelease-20200921
$ 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-prerelease-20200921
$ 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-prerelease-20200921
```

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 @@ -156,8 +156,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-20200907
$ docker run -d --net grid --name video -v /tmp/videos:/videos selenium/video:ffmpeg-4.3.1-20200907
$ 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-20200921
$ docker run -d --net grid --name video -v /tmp/videos:/videos selenium/video:ffmpeg-4.3.1-20200921
# Run your tests
$ docker stop video && docker rm video
$ docker stop selenium && docker rm selenium
Expand All @@ -184,15 +184,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-prerelease-20200907
$ docker run -d -p 4444:4444 -e SE_OPTS="-debug" --name selenium-hub selenium/hub:4.0.0-alpha-7-prerelease-20200921
```

### 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-prerelease-20200907
$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:4.0.0-alpha-7-prerelease-20200921
```

### Node configuration options
Expand All @@ -208,7 +208,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-prerelease-20200907
$ 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-prerelease-20200921
```

### Setting Screen Resolution
Expand Down Expand Up @@ -263,11 +263,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-prerelease-20200907
$ docker run -d -p 4442-4444:4442-4444 --net grid --name selenium-hub selenium/hub:4.0.0-alpha-7-prerelease-20200921
$ 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-prerelease-20200907
-v /e2e/uploads:/e2e/uploads selenium/node-firefox:4.0.0-alpha-7-prerelease-20200921
```

_Note:_ `-v /e2e/uploads:/e2e/uploads` _is optional in case you are testing browser uploads on your
Expand Down Expand Up @@ -348,10 +348,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-prerelease-20200907
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-chrome:4.0.0-alpha-7-prerelease-20200907
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-firefox:4.0.0-alpha-7-prerelease-20200907
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-opera:4.0.0-alpha-7-prerelease-20200907
selenium/hub:4.0.0-alpha-7-prerelease-20200921
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-chrome:4.0.0-alpha-7-prerelease-20200921
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-firefox:4.0.0-alpha-7-prerelease-20200921
$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-opera:4.0.0-alpha-7-prerelease-20200921
```
**Note:** The `\` line delimiter won't work on Windows based terminals, try either `^` or a backtick.

Expand Down Expand Up @@ -415,9 +415,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-prerelease-20200907
$ docker run -d -p 4445:4444 -p 5901:5900 -v /dev/shm:/dev/shm selenium/standalone-firefox:4.0.0-alpha-7-prerelease-20200907
$ docker run -d -p 4446:4444 -p 5902:5900 -v /dev/shm:/dev/shm selenium/standalone-opera:4.0.0-alpha-7-prerelease-20200907
$ docker run -d -p 4444:4444 -p 5900:5900 -v /dev/shm:/dev/shm selenium/standalone-chrome:4.0.0-alpha-7-prerelease-20200921
$ docker run -d -p 4445:4444 -p 5901:5900 -v /dev/shm:/dev/shm selenium/standalone-firefox:4.0.0-alpha-7-prerelease-20200921
$ docker run -d -p 4446:4444 -p 5902:5900 -v /dev/shm:/dev/shm selenium/standalone-opera:4.0.0-alpha-7-prerelease-20200921
```

Then, you would use in your VNC client:
Expand All @@ -435,9 +435,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-prerelease-20200907
#FROM selenium/node-firefox:4.0.0-alpha-7-prerelease-20200907
#FROM selenium/node-opera:4.0.0-alpha-7-prerelease-20200907
#FROM selenium/node-chrome:4.0.0-alpha-7-prerelease-20200921
#FROM selenium/node-firefox:4.0.0-alpha-7-prerelease-20200921
#FROM selenium/node-opera:4.0.0-alpha-7-prerelease-20200921
#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 Router/Dockerfile
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:4.0.0-alpha-7-prerelease-20200907
FROM selenium/base:4.0.0-alpha-7-prerelease-20200921
LABEL authors=SeleniumHQ

USER 1200
Expand Down
2 changes: 1 addition & 1 deletion Sessions/Dockerfile
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:4.0.0-alpha-7-prerelease-20200907
FROM selenium/base:4.0.0-alpha-7-prerelease-20200921
LABEL authors=SeleniumHQ

USER 1200
Expand Down
2 changes: 1 addition & 1 deletion StandaloneChrome/Dockerfile
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:4.0.0-alpha-7-prerelease-20200907
FROM selenium/node-chrome:4.0.0-alpha-7-prerelease-20200921
LABEL authors=SeleniumHQ

USER 1200
Expand Down
2 changes: 1 addition & 1 deletion StandaloneFirefox/Dockerfile
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:4.0.0-alpha-7-prerelease-20200907
FROM selenium/node-firefox:4.0.0-alpha-7-prerelease-20200921
LABEL authors=SeleniumHQ

USER 1200
Expand Down
2 changes: 1 addition & 1 deletion StandaloneOpera/Dockerfile
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-opera:4.0.0-alpha-7-prerelease-20200907
FROM selenium/node-opera:4.0.0-alpha-7-prerelease-20200921
LABEL authors=SeleniumHQ

USER 1200
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-prerelease-20200907
image: selenium/node-chrome:4.0.0-alpha-7-prerelease-20200921
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-prerelease-20200907
image: selenium/node-firefox:4.0.0-alpha-7-prerelease-20200921
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-prerelease-20200907
image: selenium/node-opera:4.0.0-alpha-7-prerelease-20200921
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-prerelease-20200907
image: selenium/hub:4.0.0-alpha-7-prerelease-20200921
ports:
- "4442:4442"
- "4443:4443"
Expand Down

0 comments on commit 0688f01

Please sign in to comment.