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.1-20230221? Please use the full tag, avoid "latest"
+      placeholder: 4.8.1-20230306? Please use the full tag, avoid "latest"
     validations:
       required: true

Base/Dockerfile

@@ -4,6 +4,7 @@
 #FROM ubuntu:focal-20220302
 #FROM ubuntu:focal-20220415
 #FROM ubuntu:focal-20220531
+#FROM ubuntu:focal-20230301
 FROM debian:latest
 LABEL authors="Selenium <[email protected]>"
 

NodeBase/Dockerfile

@@ -170,8 +170,7 @@ ENV SE_SCREEN_HEIGHT 1020
 ENV SE_SCREEN_DEPTH 24
 ENV SE_SCREEN_DPI 96
 ENV SE_START_XVFB true
-# Temporal fix for https://github.com/SeleniumHQ/docker-selenium/issues/1610
-ENV START_XVFB true
+ENV SE_START_VNC true
 ENV SE_START_NO_VNC true
 ENV SE_NO_VNC_PORT 7900
 ENV SE_VNC_PORT 5900

NodeBase/start-novnc.sh

@@ -3,10 +3,14 @@
 # IMPORTANT: Change this file only in directory NodeBase!
 
 if [ "${START_XVFB:-$SE_START_XVFB}" = true ] ; then
-  if [ "${START_NO_VNC:-$SE_START_NO_VNC}" = true ] ; then
-    /opt/bin/noVNC/utils/novnc_proxy --listen ${NO_VNC_PORT:-$SE_NO_VNC_PORT} --vnc localhost:${VNC_PORT:-$SE_VNC_PORT}
+  if [ "${START_VNC:-$SE_START_VNC}" = true ] ; then
+    if [ "${START_NO_VNC:-$SE_START_NO_VNC}" = true ] ; then
+      /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
   else
-    echo "noVNC won't start because SE_START_NO_VNC is false."
+    echo "noVNC won't start because VNC is configured to not start."
   fi
 else
   echo "noVNC won't start because Xvfb is configured to not start."

NodeBase/start-vnc.sh

@@ -3,42 +3,45 @@
 # IMPORTANT: Change this file only in directory NodeBase!
 
 if [ "${START_XVFB:-$SE_START_XVFB}" = true ] ; then
-  # Centering wallpaper
-  for i in $(seq 1 10)
-  do
-    sleep 0.5
-    echo "Centering wallpaper"
-    /usr/bin/fbsetbg -c /usr/share/images/fluxbox/ubuntu-light.png
-    if [ $? -eq 0 ]; then
-      break
-    fi    
-  done  
-
-  VNC_NO_PASSWORD=${VNC_NO_PASSWORD:-$SE_VNC_NO_PASSWORD}
-  if [ ! -z $VNC_NO_PASSWORD ]; then
-      echo "Starting VNC server without password authentication"
-      X11VNC_OPTS=
-  else
-      X11VNC_OPTS=-usepw
-  fi
-
-  VNC_VIEW_ONLY=${VNC_VIEW_ONLY:-$SE_VNC_VIEW_ONLY}
-  if [ ! -z $VNC_VIEW_ONLY ]; then
-      echo "Starting VNC server with viewonly option"
-      X11VNC_OPTS="${X11VNC_OPTS} -viewonly"
-  fi
+  if [ "${START_VNC:-$SE_START_VNC}" = true ] ; then
+    # Centering wallpaper
+    for i in $(seq 1 10)
+    do
+      sleep 0.5
+      echo "Centering wallpaper"
+      /usr/bin/fbsetbg -c /usr/share/images/fluxbox/ubuntu-light.png
+      if [ $? -eq 0 ]; then
+        break
+      fi    
+    done  
+    VNC_NO_PASSWORD=${VNC_NO_PASSWORD:-$SE_VNC_NO_PASSWORD}
+    if [ ! -z $VNC_NO_PASSWORD ]; then
+        echo "Starting VNC server without password authentication"
+        X11VNC_OPTS=
+    else
+        X11VNC_OPTS=-usepw
+    fi
 
-  for i in $(seq 1 10)
-  do
-    sleep 1
-    xdpyinfo -display ${DISPLAY} >/dev/null 2>&1
-    if [ $? -eq 0 ]; then
-      break
+    VNC_VIEW_ONLY=${VNC_VIEW_ONLY:-$SE_VNC_VIEW_ONLY}
+    if [ ! -z $VNC_VIEW_ONLY ]; then
+        echo "Starting VNC server with viewonly option"
+        X11VNC_OPTS="${X11VNC_OPTS} -viewonly"
     fi
-    echo "Waiting for Xvfb..."
-  done
 
-  x11vnc ${X11VNC_OPTS} -forever -shared -rfbport ${VNC_PORT:-$SE_VNC_PORT} -rfbportv6 ${VNC_PORT:-$SE_VNC_PORT} -display ${DISPLAY}
+    for i in $(seq 1 10)
+    do
+      sleep 1
+      xdpyinfo -display ${DISPLAY} >/dev/null 2>&1
+      if [ $? -eq 0 ]; then
+        break
+      fi
+      echo "Waiting for Xvfb..."
+    done
+
+    x11vnc ${X11VNC_OPTS} -forever -shared -rfbport ${VNC_PORT:-$SE_VNC_PORT} -rfbportv6 ${VNC_PORT:-$SE_VNC_PORT} -display ${DISPLAY}
+  else
+    echo "VNC won't start because SE_START_VNC is false."
+  fi
 else
-  echo "Vnc won't start because Xvfb is configured to not start."
+  echo "VNC won't start because Xvfb is configured to not start."
 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.1-20230221", '{"browserName": "firefox", "platformName": "linux"}',
-    "selenium/standalone-chrome:4.8.1-20230221", '{"browserName": "chrome", "platformName": "linux"}',
-    "selenium/standalone-edge:4.8.1-20230221", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
+    "selenium/standalone-firefox:4.8.1-20230306", '{"browserName": "firefox", "platformName": "linux"}',
+    "selenium/standalone-chrome:4.8.1-20230306", '{"browserName": "chrome", "platformName": "linux"}',
+    "selenium/standalone-edge:4.8.1-20230306", '{"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-20230221"
+video-image = "selenium/video:ffmpeg-4.3.1-20230306"
 
 # Uncomment the following section if you are running the node on a separate VM
 # Fill out the placeholders with appropriate values