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.5.2-20221021? Please use the full tag, avoid "latest"
+      placeholder: 4.5.3-20221024? Please use the full tag, avoid "latest"
     validations:
       required: true

Base/Dockerfile

@@ -90,9 +90,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.5.0/selenium-server-4.5.2.jar \
+  && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.5.0/selenium-server-4.5.3.jar \
     -O /opt/selenium/selenium-server.jar \
-  && wget --no-verbose https://repo1.maven.org/maven2/org/seleniumhq/selenium/selenium-http-jdk-client/4.5.2/selenium-http-jdk-client-4.5.2.jar \
+  && wget --no-verbose https://repo1.maven.org/maven2/org/seleniumhq/selenium/selenium-http-jdk-client/4.5.3/selenium-http-jdk-client-4.5.3.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
@@ -104,7 +104,6 @@ USER 1200:1201
 
 # Boolean value, maps "--bind-host"
 ENV SE_BIND_HOST false
-ENV SE_DOCKER true
 
 
 

NodeBase/selenium.conf

@@ -55,7 +55,7 @@ stderr_capture_maxbytes=50MB
 
 [program:selenium-node]
 priority=15
-command=bash -c "/opt/bin/start-selenium-node.sh && kill -s SIGINT `cat /var/run/supervisor/supervisord.pid`"
+command=bash -c "/opt/bin/start-selenium-node.sh; EXIT_CODE=$?; kill -s SIGINT `cat /var/run/supervisor/supervisord.pid`; exit $EXIT_CODE"
 stopasgroup = true
 autostart=true
 autorestart=false

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.5.2-20221021", '{"browserName": "firefox", "platformName": "linux"}',
-    "selenium/standalone-chrome:4.5.2-20221021", '{"browserName": "chrome", "platformName": "linux"}',
-    "selenium/standalone-edge:4.5.2-20221021", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
+    "selenium/standalone-firefox:4.5.3-20221024", '{"browserName": "firefox", "platformName": "linux"}',
+    "selenium/standalone-chrome:4.5.3-20221024", '{"browserName": "chrome", "platformName": "linux"}',
+    "selenium/standalone-edge:4.5.3-20221024", '{"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-20221021"
+video-image = "selenium/video:ffmpeg-4.3.1-20221024"
 
 # Uncomment the following section if you are running the node on a separate VM
 # Fill out the placeholders with appropriate values