From 9e4b936afce8015886efda80c334855e55755186 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Wed, 10 Mar 2021 13:25:21 +0100 Subject: [PATCH] Grid Beta 2 aadc2039d7 (#1228) [deploy][prerelease] --- Base/Dockerfile | 6 +++--- NodeBase/Dockerfile.txt | 2 +- NodeBase/generate_config | 4 ++-- README.md | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Base/Dockerfile b/Base/Dockerfile index 9a43a2a23..5f640ae56 100644 --- a/Base/Dockerfile +++ b/Base/Dockerfile @@ -71,10 +71,10 @@ 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/docker-selenium/raw/beta-jars/selenium-server-4.0.0-prerelease-beta-1-0f2429af7a.jar \ -# -O /opt/selenium/selenium-server.jar \ - && wget --no-verbose https://selenium-release.storage.googleapis.com/4.0-beta-1/selenium-server-4.0.0-beta-1.jar \ + && wget --no-verbose https://github.com/SeleniumHQ/docker-selenium/raw/beta-jars/selenium-server-4.0.0-prerelease-beta-2-aadc2039d7.jar \ -O /opt/selenium/selenium-server.jar \ + # && wget --no-verbose https://selenium-release.storage.googleapis.com/4.0-beta-1/selenium-server-4.0.0-beta-1.jar \ + # -O /opt/selenium/selenium-server.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 diff --git a/NodeBase/Dockerfile.txt b/NodeBase/Dockerfile.txt index 21ecc7add..09abf57c4 100644 --- a/NodeBase/Dockerfile.txt +++ b/NodeBase/Dockerfile.txt @@ -140,7 +140,7 @@ ENV START_XVFB true # Selenium Configuration #======================== # As integer, maps to "max-concurrent-sessions" -ENV SE_NODE_MAX_CONCURRENT_SESSIONS 1 +ENV SE_NODE_MAX_SESSIONS 1 # Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87 ENV DBUS_SESSION_BUS_ADDRESS=/dev/null diff --git a/NodeBase/generate_config b/NodeBase/generate_config index 19f038966..62e5719ab 100755 --- a/NodeBase/generate_config +++ b/NodeBase/generate_config @@ -14,7 +14,7 @@ fi if [[ -z "${SE_NODE_HOST}" ]]; then echo "Setting up SE_NODE_HOST..." else - echo "hostname = \"${SE_NODE_HOST}\"" >> /opt/selenium/config.toml + echo "host = \"${SE_NODE_HOST}\"" >> /opt/selenium/config.toml fi if [[ -z "${SE_NODE_PORT}" ]]; then @@ -24,6 +24,6 @@ else fi echo "[node] -max-concurrent-sessions = ${SE_NODE_MAX_CONCURRENT_SESSIONS} +max-sessions = ${SE_NODE_MAX_SESSIONS} " >> /opt/selenium/config.toml diff --git a/README.md b/README.md index 96f9095fe..3daea9526 100644 --- a/README.md +++ b/README.md @@ -273,14 +273,14 @@ configs = [ # Linux could use --net=host in the `docker run` instruction or 172.17.0.1 in the URI below. # To have Docker listening through tcp on macOS, install socat and run the following command # socat -4 TCP-LISTEN:2375,fork UNIX-CONNECT:/var/run/docker.sock -host = "tcp://host.docker.internal:2375" +url = "tcp://host.docker.internal:2375" # Docker imagee used for video recording video-image = "selenium/video:ffmpeg-4.3.1-20210215" # Uncomment the following section if you are running the node on a separate VM # Fill out the placeholders with appropriate values #[server] -#hostname = +#host = #port = ```