Skip to content
This repository was archived by the owner on Jun 22, 2024. It is now read-only.

Commit 60f4a0f

Browse files
Merge branch 'trunk' of https://github.com/SeleniumHQ/docker-selenium into trunk
2 parents 5a1db9b + a9c6ba6 commit 60f4a0f

File tree

5 files changed

+23
-22
lines changed

5 files changed

+23
-22
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ name: Build & test
22

33
on:
44
push:
5-
branches:
6-
- trunk
75
pull_request:
8-
branches:
9-
- trunk
106

117
permissions:
128
contents: read
@@ -25,7 +21,7 @@ jobs:
2521
- name: Output Docker info
2622
run: docker info
2723
- name: Set up Python 3.8
28-
uses: actions/setup-python@v4.4.0
24+
uses: actions/setup-python@v4.5.0
2925
with:
3026
python-version: 3.8
3127
- name: Get branch name (only for push to branch)

.github/workflows/deploy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,25 @@ jobs:
5151
DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
5252
DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
5353
- name: Deploy new images
54-
uses: nick-invision/retry@3e91a01664abd3c5cd539100d10d33b9c5b68482 # v2
54+
uses: nick-invision/retry@943e742917ac94714d2f408a0e8320f2d1fcafcd # v2
5555
with:
5656
timeout_minutes: 20
5757
max_attempts: 3
5858
command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make release
5959
- name: Tag images as latest
60-
uses: nick-invision/retry@3e91a01664abd3c5cd539100d10d33b9c5b68482 # v2
60+
uses: nick-invision/retry@943e742917ac94714d2f408a0e8320f2d1fcafcd # v2
6161
with:
6262
timeout_minutes: 20
6363
max_attempts: 3
6464
command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make tag_latest
6565
- name: Deploy latest tag
66-
uses: nick-invision/retry@3e91a01664abd3c5cd539100d10d33b9c5b68482 # v2
66+
uses: nick-invision/retry@943e742917ac94714d2f408a0e8320f2d1fcafcd # v2
6767
with:
6868
timeout_minutes: 20
6969
max_attempts: 3
7070
command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make release_latest
7171
- name: Tag browser images
72-
uses: nick-invision/retry@3e91a01664abd3c5cd539100d10d33b9c5b68482 # v2
72+
uses: nick-invision/retry@943e742917ac94714d2f408a0e8320f2d1fcafcd # v2
7373
with:
7474
timeout_minutes: 20
7575
max_attempts: 3

.github/workflows/helm-chart-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
git config user.email "[email protected]"
2424
2525
- name: Run chart-releaser
26-
uses: helm/chart-releaser-action@v1.4.1
26+
uses: helm/chart-releaser-action@v1.5.0
2727
env:
2828
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/test-video.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ name: Test video files
22

33
on:
44
push:
5-
branches:
6-
- trunk
75
pull_request:
8-
branches:
9-
- trunk
106

117
permissions:
128
contents: read
@@ -22,7 +18,7 @@ jobs:
2218
- name: Output Docker info
2319
run: docker info
2420
- name: Set up Python 3.8
25-
uses: actions/setup-python@v4.4.0
21+
uses: actions/setup-python@v4.5.0
2622
with:
2723
python-version: 3.8
2824
- name: Get branch name (only for push to branch)

README.md

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -925,12 +925,12 @@ captured in the same video.
925925
[Chrome](https://developers.google.com/web/updates/2017/04/headless-chrome),
926926
When using headless mode, there's no need for the [Xvfb](https://en.wikipedia.org/wiki/Xvfb) server to be started.
927927

928-
To avoid starting the server you can set the `SE_START_XVFB` environment variable to `false`
928+
To avoid starting the server you can set the `START_XVFB` environment variable to `false`
929929
(or any other value than `true`), for example:
930930

931931
``` bash
932932
$ docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub -e SE_EVENT_BUS_PUBLISH_PORT=4442 \
933-
-e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 -e SE_START_XVFB=false --shm-size="2g" selenium/node-chrome:4.7.2-20221219
933+
-e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 -e START_XVFB=false --shm-size="2g" selenium/node-chrome:4.7.2-20221219
934934
```
935935

936936
For more information, see this GitHub [issue](https://github.com/SeleniumHQ/docker-selenium/issues/567).
@@ -1176,15 +1176,24 @@ If you get a prompt asking for a password, it is: `secret`. If you wish to chang
11761176
it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a Docker image that derives from
11771177
the posted ones which reconfigures it:
11781178

1179+
Dockerfile example that extends the `node-chrome:4.7.2-20221219`. You can choose another browser image or a Standalone
1180+
browser image.
1181+
11791182
``` dockerfile
1180-
#FROM selenium/node-chrome:4.7.2-20221219
1181-
#FROM selenium/node-edge:4.7.2-20221219
1182-
#FROM selenium/node-firefox:4.7.2-20221219
1183-
#Choose the FROM statement that works for you.
1183+
FROM selenium/node-chrome:4.7.2-20221219
11841184

11851185
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
11861186
```
11871187

1188+
Save the `Dockerfile` as `DockerfileVNCPasswordChanged`, open a terminal and on the same directory run:
1189+
1190+
```shell
1191+
docker build -t selenium/node-chrome-vnc-password-changed:4.7.2-20221219 -f DockerfileVNCPasswordChanged .
1192+
```
1193+
1194+
And from now on, instead of using `node-chrome:4.7.2-20221219` in your scripts or docker-compose files, use
1195+
`selenium/node-chrome-vnc-password-changed:4.7.2-20221219`.
1196+
11881197
If you want to run VNC without password authentication you can set the environment variable `SE_VNC_NO_PASSWORD=1`.
11891198

11901199
If you want to run VNC in view-only mode you can set the environment variable `SE_VNC_VIEW_ONLY=1`.
@@ -1285,7 +1294,7 @@ or
12851294

12861295
`Message: unknown error: Chrome failed to start: exited abnormally`
12871296

1288-
The reason _might_ be that you've set the `SE_START_XVFB` environment variable to "false", but forgot to
1297+
The reason _might_ be that you've set the `START_XVFB` environment variable to "false", but forgot to
12891298
actually run Firefox, Chrome or Edge in headless mode.
12901299

12911300
### Mounting volumes to retrieve downloaded files

0 commit comments

Comments
 (0)