merge from upstream

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.8.0-20230202? Please use the full tag, avoid "latest"
+      placeholder: 4.8.0-20230210? Please use the full tag, avoid "latest"
     validations:
       required: true

NodeBase/Dockerfile

@@ -92,27 +92,20 @@ RUN apt-get -qqy update \
 ########################################
 # noVNC exposes VNC through a web page #
 ########################################
-# Download https://github.com/novnc/noVNC dated 2021-03-30 commit 84f102d6a9ffaf3972693d59bad5c6fddb6d7fb0
-# Download https://github.com/novnc/websockify dated 2021-03-22 commit c5d365dd1dbfee89881f1c1c02a2ac64838d645f
-# Install procps as noVNC's launch.sh depends on it to launch websockify properly
-ENV NOVNC_SHA="84f102d6a9ffaf3972693d59bad5c6fddb6d7fb0" \
-    WEBSOCKIFY_SHA="c5d365dd1dbfee89881f1c1c02a2ac64838d645f"
+ENV NOVNC_VERSION="1.4.0" \
+    WEBSOCKIFY_VERSION="0.11.0"
 RUN  wget -nv -O noVNC.zip \
-       "https://github.com/novnc/noVNC/archive/${NOVNC_SHA}.zip" \
+       "https://github.com/novnc/noVNC/archive/refs/tags/v${NOVNC_VERSION}.zip" \
   && unzip -x noVNC.zip \
-  && mv noVNC-${NOVNC_SHA} /opt/bin/noVNC \
+  && mv noVNC-${NOVNC_VERSION} /opt/bin/noVNC \
   && cp /opt/bin/noVNC/vnc.html /opt/bin/noVNC/index.html \
   && rm noVNC.zip \
   && wget -nv -O websockify.zip \
-      "https://github.com/novnc/websockify/archive/${WEBSOCKIFY_SHA}.zip" \
+      "https://github.com/novnc/websockify/archive/refs/tags/v${WEBSOCKIFY_VERSION}.zip" \
   && unzip -x websockify.zip \
   && rm websockify.zip \
-  && rm -rf websockify-${WEBSOCKIFY_SHA}/tests \
-  && mv websockify-${WEBSOCKIFY_SHA} /opt/bin/noVNC/utils/websockify \
-  && apt-get -qqy update \
-  && apt-get -qqy --no-install-recommends install procps \
-  && rm -rf /var/lib/apt/lists/* \
-  && apt-get -qqy clean
+  && rm -rf websockify-${WEBSOCKIFY_VERSION}/tests \
+  && mv websockify-${WEBSOCKIFY_VERSION} /opt/bin/noVNC/utils/websockify
 
 #=========================================================================================================================================
 # Run this command for executable file permissions for /dev/shm when this is a "child" container running in Docker Desktop and WSL2 distro

NodeBase/start-novnc.sh

@@ -4,7 +4,7 @@
 
 if [ "${START_XVFB:-$SE_START_XVFB}" = true ] ; then
   if [ "${START_NO_VNC:-$SE_START_NO_VNC}" = true ] ; then
-    /opt/bin/noVNC/utils/launch.sh --listen ${NO_VNC_PORT:-$SE_NO_VNC_PORT} --vnc localhost:${VNC_PORT:-$SE_VNC_PORT}
+    /opt/bin/noVNC/utils/novnc_proxy --listen ${NO_VNC_PORT:-$SE_NO_VNC_PORT} --vnc localhost:${VNC_PORT:-$SE_VNC_PORT}
   else
     echo "noVNC won't start because SE_START_NO_VNC is false."
   fi

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