Merging 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.2.1-20220531? Please use the full tag, avoid "latest"
+      placeholder: 4.2.2-20220609? Please use the full tag, avoid "latest"
     validations:
       required: true

.github/workflows/build-test.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Output Docker info
         run: docker info
       - name: Set up Python 3.8
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: 3.8
       - name: Get branch name (only for push to branch)

.github/workflows/test-video.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Output Docker info
         run: docker info
       - name: Set up Python 3.8
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: 3.8
       - name: Get branch name (only for push to branch)

.gitpod.yml

@@ -0,0 +1,6 @@
+tasks:
+  - name: Show README link and build instructions
+    before: | 
+      echo "Try out Selenium Grid in Docker by following https://github.com/SeleniumHQ/docker-selenium#execution-modes"
+      echo "To build all images, run 'make all'. See more instructions at https://github.com/SeleniumHQ/docker-selenium/wiki/Building-your-own-images"
+

Base/Dockerfile

@@ -3,6 +3,7 @@
 #FROM ubuntu:focal-20211006
 #FROM ubuntu:focal-20220302
 #FROM ubuntu:focal-20220415
+#FROM ubuntu:focal-20220531
 FROM debian:latest
 LABEL authors="Selenium <[email protected]>"
 
@@ -89,7 +90,7 @@ 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.2.0/selenium-server-4.2.1.jar \
+  && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.2.0/selenium-server-4.2.2.jar \
     -O /opt/selenium/selenium-server.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

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.2.1-20220531
+FROM selenium/base:4.2.2-20220609
 LABEL authors=SeleniumHQ
 
 USER 1200

Distributor/start-selenium-grid-distributor.sh

@@ -55,7 +55,7 @@ if [ ! -z "$SE_DISTRIBUTOR_PORT" ]; then
 fi
 
 
-java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar distributor \
+java ${JAVA_OPTS:-$SE_JAVA_OPTS} -jar /opt/selenium/selenium-server.jar distributor \
   --sessions-host "${SE_SESSIONS_MAP_HOST}" --sessions-port "${SE_SESSIONS_MAP_PORT}" \
   --sessionqueue-host "${SE_SESSION_QUEUE_HOST}" --sessionqueue-port "${SE_SESSION_QUEUE_PORT}" \
   --publish-events tcp://"${SE_EVENT_BUS_HOST}":"${SE_EVENT_BUS_PUBLISH_PORT}" \

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.2.1-20220531
+FROM selenium/base:4.2.2-20220609
 LABEL authors=SeleniumHQ
 
 USER 1200

EventBus/start-selenium-grid-eventbus.sh

@@ -19,7 +19,7 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "Appending Selenium options: ${SE_OPTS}"
 fi
 
-java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar event-bus \
+java ${JAVA_OPTS:-$SE_JAVA_OPTS} -jar /opt/selenium/selenium-server.jar event-bus \
   --bind-host ${SE_BIND_HOST} \
   ${HOST_CONFIG} \
   ${PORT_CONFIG} \

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.2.1-20220531
+FROM selenium/base:4.2.2-20220609
 LABEL authors=SeleniumHQ
 
 USER 1200