Merge branch 'trunk' of https://github.com/SeleniumHQ/docker-selenium into trunk

Author: jamesmortensen

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -55,6 +55,6 @@ body:
     attributes:
       label: Docker Selenium version (tag)
       description: What version of Docker Selenium are you using?
-      placeholder: 4.9.0-20230421? Please use the full tag, avoid "latest"
+      placeholder: 4.10.0-20230607? Please use the full tag, avoid "latest"
     validations:
       required: true

.github/workflows/build-test.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Output Docker info
         run: docker info
       - name: Set up Python 3.8
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           python-version: 3.8
       - name: Get branch name (only for push to branch)

.github/workflows/lock.yml

@@ -14,7 +14,7 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@c1b35aecc5cdb1a34539d14196df55838bb2f836 # v3
+      - uses: dessant/lock-threads@be8aa5be94131386884a6da4189effda9b14aa21 # v3
         with:
           process-only: 'issues'
           issue-lock-inactive-days: '30'

.github/workflows/test-video.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Output Docker info
         run: docker info
       - name: Set up Python 3.8
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           python-version: 3.8
       - name: Get branch name (only for push to branch)

Base/Dockerfile

@@ -92,9 +92,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.1.jar \
+  && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.10.0/selenium-server-4.10.0.jar \
     -O /opt/selenium/selenium-server.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 \
+  && wget --no-verbose https://repo1.maven.org/maven2/org/seleniumhq/selenium/selenium-http-jdk-client/4.10.0/selenium-http-jdk-client-4.10.0.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 \

Hub/start-selenium-grid-hub.sh

@@ -17,6 +17,11 @@ if [ ! -z "$SE_HUB_PORT" ]; then
   PORT_CONFIG="--port ${SE_HUB_PORT}"
 fi
 
+if [ ! -z "$SE_SUB_PATH" ]; then
+  echo "Using SE_SUB_PATH: ${SE_SUB_PATH}"
+  SUB_PATH_CONFIG="--sub-path ${SE_SUB_PATH}"
+fi
+
 EXTRA_LIBS="/opt/selenium/selenium-http-jdk-client.jar"
 
 if [ ! -z "$SE_ENABLE_TRACING" ]; then
@@ -39,4 +44,5 @@ java ${JAVA_OPTS:-$SE_JAVA_OPTS} -Dwebdriver.http.factory=jdk-http-client \
   --config /opt/selenium/config.toml \
   ${HOST_CONFIG} \
   ${PORT_CONFIG} \
+  ${SUB_PATH_CONFIG} \
   ${SE_OPTS}

NodeDocker/config.toml

@@ -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.9.0-20230421", '{"browserName": "firefox", "platformName": "linux"}',
-    "selenium/standalone-chrome:4.9.0-20230421", '{"browserName": "chrome", "platformName": "linux"}',
-    "selenium/standalone-edge:4.9.0-20230421", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
+    "selenium/standalone-firefox:4.10.0-20230607", '{"browserName": "firefox", "platformName": "linux"}',
+    "selenium/standalone-chrome:4.10.0-20230607", '{"browserName": "chrome", "platformName": "linux"}',
+    "selenium/standalone-edge:4.10.0-20230607", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
     ]
 
 # URL for connecting to the docker daemon
@@ -14,7 +14,7 @@ configs = [
 # socat -4 TCP-LISTEN:2375,fork UNIX-CONNECT:/var/run/docker.sock
 url = "http://127.0.0.1:2375"
 # Docker image used for video recording
-video-image = "selenium/video:ffmpeg-4.3.1-20230421"
+video-image = "selenium/video:ffmpeg-4.3.1-20230607"
 
 # Uncomment the following section if you are running the node on a separate VM
 # Fill out the placeholders with appropriate values