[deploy] 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.3.0-20220624? Please use the full tag, avoid "latest"
+      placeholder: 4.3.0-20220706? Please use the full tag, avoid "latest"
     validations:
       required: true

Base/supervisord.conf

@@ -11,5 +11,18 @@ nodaemon=true                                 ; (start in foreground if true;def
 minfds=1024                                   ; (min. avail startup file descriptors;default 1024)
 minprocs=200                                  ; (min. avail process descriptors;default 200)
 
+[unix_http_server]
+file=/tmp/supervisor.sock                     ; (the path to the socket file)
+chmod=0700
+
+; the below section must remain in the config file for RPC
+; (supervisorctl/web interface) to work, additional interfaces may be
+; added by defining them in separate rpcinterface: sections
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///tmp/supervisor.sock         ; use a unix:// URL  for a unix socket
+
 [include]
 files = /etc/supervisor/conf.d/*.conf

Distributor/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/base:4.3.0-20220624
+FROM selenium/base:4.3.0-20220706
 LABEL authors=SeleniumHQ
 
 USER 1200

EventBus/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/base:4.3.0-20220624
+FROM selenium/base:4.3.0-20220706
 LABEL authors=SeleniumHQ
 
 USER 1200

Hub/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/base:4.3.0-20220624
+FROM selenium/base:4.3.0-20220706
 LABEL authors=SeleniumHQ
 
 USER 1200
@@ -18,7 +18,7 @@ EXPOSE 4444
 # In seconds, maps to "--session-request-timeout"
 ENV SE_SESSION_REQUEST_TIMEOUT 300
 # In seconds, maps to "--session-retry-interval"
-ENV SE_SESSION_RETRY_INTERVAL 0
+ENV SE_SESSION_RETRY_INTERVAL 15
 # Boolean value, maps "--relax-checks"
 ENV SE_RELAX_CHECKS true
 

Hub/Dockerfile.txt

@@ -11,7 +11,7 @@ EXPOSE 4444
 # In seconds, maps to "--session-request-timeout"
 ENV SE_SESSION_REQUEST_TIMEOUT 300
 # In seconds, maps to "--session-retry-interval"
-ENV SE_SESSION_RETRY_INTERVAL 0
+ENV SE_SESSION_RETRY_INTERVAL 15
 # Boolean value, maps "--relax-checks"
 ENV SE_RELAX_CHECKS true
 

NodeBase/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/base:4.3.0-20220624
+FROM selenium/base:4.3.0-20220706
 LABEL authors=SeleniumHQ
 
 USER root
@@ -70,10 +70,11 @@ RUN apt-get update -qqy \
 # Removed packages:
 # xfonts-100dpi            ~6 MB
 # xfonts-75dpi             ~6 MB
+# fonts-noto-color-emoji   ~10 MB
 # Regarding fonts-liberation see:
 #  https://github.com/SeleniumHQ/docker-selenium/issues/383#issuecomment-278367069
-# Layer size: small: 36.28 MB (with --no-install-recommends)
-# Layer size: small: 36.28 MB
+# Layer size: small: 50.3 MB (with --no-install-recommends)
+# Layer size: small: 50.3 MB
 RUN apt-get -qqy update \
   && apt-get -qqy --no-install-recommends install \
     libfontconfig \
@@ -85,6 +86,7 @@ RUN apt-get -qqy update \
     fonts-wqy-zenhei \
     fonts-tlwg-loma-otf \
     # ttf-ubuntu-font-family \
+    fonts-noto-color-emoji \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get -qyy clean
 

NodeBase/Dockerfile.txt

@@ -63,10 +63,11 @@ RUN apt-get update -qqy \
 # Removed packages:
 # xfonts-100dpi            ~6 MB
 # xfonts-75dpi             ~6 MB
+# fonts-noto-color-emoji   ~10 MB
 # Regarding fonts-liberation see:
 #  https://github.com/SeleniumHQ/docker-selenium/issues/383#issuecomment-278367069
-# Layer size: small: 36.28 MB (with --no-install-recommends)
-# Layer size: small: 36.28 MB
+# Layer size: small: 50.3 MB (with --no-install-recommends)
+# Layer size: small: 50.3 MB
 RUN apt-get -qqy update \
   && apt-get -qqy --no-install-recommends install \
     libfontconfig \
@@ -78,6 +79,7 @@ RUN apt-get -qqy update \
     fonts-wqy-zenhei \
     fonts-tlwg-loma-otf \
     # ttf-ubuntu-font-family \
+    fonts-noto-color-emoji \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get -qyy clean
 

NodeBase/selenium.conf

@@ -6,9 +6,7 @@
 priority=0
 command=/opt/bin/start-xvfb.sh
 autostart=true
-autorestart=false
-startsecs=0
-startretries=0
+autorestart=true
 
 ;Logs
 redirect_stderr=false
@@ -25,9 +23,7 @@ stderr_capture_maxbytes=50MB
 priority=5
 command=/opt/bin/start-vnc.sh
 autostart=true
-autorestart=false
-startsecs=0
-startretries=0
+autorestart=true
 
 ;Logs
 redirect_stderr=false
@@ -44,9 +40,7 @@ stderr_capture_maxbytes=50MB
 priority=10
 command=/opt/bin/start-novnc.sh
 autostart=true
-autorestart=false
-startsecs=0
-startretries=0
+autorestart=true
 
 ;Logs
 redirect_stderr=false

NodeChrome/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-base:4.3.0-20220624
+FROM selenium/node-base:4.3.0-20220706
 LABEL authors=SeleniumHQ
 
 USER root