From 59a29ee87c900e9b77301009a5c5401efbd6533b Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Thu, 27 Apr 2023 22:19:09 +0200 Subject: [PATCH 1/4] Refining README file [skip ci] --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0f77966d8..b657f1f20 100644 --- a/README.md +++ b/README.md @@ -520,7 +520,8 @@ there, and when the test completes, the container gets thrown away. This execution mode can be used either in the Standalone or Node roles. The "dynamic" execution mode needs to be told what Docker images to use when the containers get started. -Additionally, the Grid needs to know the URI of the Docker daemon. +Additionally, the Grid needs to know the URI of the Docker daemon. This configuration can +be placed in a local `toml` file. ### Configuration example @@ -530,14 +531,14 @@ 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.9.0-20230421", "{\"browserName\": \"firefox\"}", - "selenium/standalone-chrome:4.9.0-20230421", "{\"browserName\": \"chrome\"}", - "selenium/standalone-edge:4.9.0-20230421", "{\"browserName\": \"MicrosoftEdge\"}" - ] + "selenium/standalone-firefox:4.9.0-20230421", '{"browserName": "firefox"}', + "selenium/standalone-chrome:4.9.0-20230421", '{"browserName": "chrome"}', + "selenium/standalone-edge:4.9.0-20230421", '{"browserName": "MicrosoftEdge"}' +] # URL for connecting to the docker daemon # Most simple approach, leave it as http://127.0.0.1:2375, and mount /var/run/docker.sock. -# 127.0.0.1 is used because interally the container uses socat when /var/run/docker.sock is mounted +# 127.0.0.1 is used because internally the container uses socat when /var/run/docker.sock is mounted # If var/run/docker.sock is not mounted: # Windows: make sure Docker Desktop exposes the daemon via tcp, and use http://host.docker.internal:2375. # macOS: install socat and run the following command, socat -4 TCP-LISTEN:2375,fork UNIX-CONNECT:/var/run/docker.sock, From b219fc66c13081627d91973a9b27a2c83d796be3 Mon Sep 17 00:00:00 2001 From: Stephan Erlank Date: Tue, 2 May 2023 19:57:44 +1200 Subject: [PATCH 2/4] Adding VNC_PASSWORD to configure VNC password (#1840) --- NodeBase/start-vnc.sh | 6 ++++++ README.md | 23 ++--------------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/NodeBase/start-vnc.sh b/NodeBase/start-vnc.sh index ad17d351e..345ac94e9 100755 --- a/NodeBase/start-vnc.sh +++ b/NodeBase/start-vnc.sh @@ -28,6 +28,12 @@ if [ "${START_XVFB:-$SE_START_XVFB}" = true ] ; then X11VNC_OPTS="${X11VNC_OPTS} -viewonly" fi + VNC_PASSWORD=${VNC_PASSWORD:-$SE_VNC_PASSWORD} + if [ ! -z $VNC_PASSWORD ]; then + echo "Starting VNC server with custom password" + x11vnc -storepasswd ${VNC_PASSWORD} ${HOME}/.vnc/passwd + fi + for i in $(seq 1 10) do sleep 1 diff --git a/README.md b/README.md index b657f1f20..11327cef9 100644 --- a/README.md +++ b/README.md @@ -1092,27 +1092,8 @@ Then, you would use in your VNC client: - Port 5901 to connect to the Edge container - Port 5902 to connect to the Firefox container -If you get a prompt asking for a password, it is: `secret`. If you wish to change this, 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 example that extends the `node-chrome:4.9.0-20230421`. You can choose another browser image or a Standalone -browser image. - -``` dockerfile -FROM selenium/node-chrome:4.9.0-20230421 - -RUN x11vnc -storepasswd /home/seluser/.vnc/passwd -``` - -Save the `Dockerfile` as `DockerfileVNCPasswordChanged`, open a terminal and on the same directory run: - -```shell -docker build -t selenium/node-chrome-vnc-password-changed:4.9.0-20230421 -f DockerfileVNCPasswordChanged . -``` - -And from now on, instead of using `node-chrome:4.9.0-20230421` in your scripts or docker-compose files, use -`selenium/node-chrome-vnc-password-changed:4.9.0-20230421`. +If you get a prompt asking for a password, it is: `secret`. If you wish to change this, +you can set the environment variable `SE_VNC_PASSWORD`. If you want to run VNC without password authentication you can set the environment variable `SE_VNC_NO_PASSWORD=1`. From 04b4ad124537ee659c0c63dddb54921b8d9c648a Mon Sep 17 00:00:00 2001 From: Luis Correia Date: Mon, 8 May 2023 16:43:13 +0100 Subject: [PATCH 3/4] Update Dockerfile, bump to 4.9.1 (#1843) --- Base/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Base/Dockerfile b/Base/Dockerfile index f524829cf..7662327ab 100644 --- a/Base/Dockerfile +++ b/Base/Dockerfile @@ -72,9 +72,9 @@ COPY supervisord.conf /etc RUN mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor \ && touch /opt/selenium/config.toml \ && chmod -R 777 /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor /etc/passwd \ - && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.9.0/selenium-server-4.9.0.jar \ + && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.9.0/selenium-server-4.9.1.jar \ -O /opt/selenium/selenium-server.jar \ - && wget --no-verbose https://repo1.maven.org/maven2/org/seleniumhq/selenium/selenium-http-jdk-client/4.9.0/selenium-http-jdk-client-4.9.0.jar \ + && wget --no-verbose https://repo1.maven.org/maven2/org/seleniumhq/selenium/selenium-http-jdk-client/4.9.1/selenium-http-jdk-client-4.9.1.jar \ -O /opt/selenium/selenium-http-jdk-client.jar \ && chgrp -R 0 /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \ && chmod -R g=u /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \ From 17ce8e35f986d2ebca6c12d491395d3c650825a1 Mon Sep 17 00:00:00 2001 From: James Mortensen Date: Mon, 8 May 2023 16:58:08 +0000 Subject: [PATCH 4/4] [deploy] 4.9.1