merge from upstream/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.1.3-20220327? Please use the full tag, avoid "latest"
+      placeholder: 4.1.4-20220427? Please use the full tag, avoid "latest"
     validations:
       required: true

.github/dependabot.yml

@@ -42,3 +42,9 @@ updates:
     interval: daily
     time: '08:00'
   open-pull-requests-limit: 99
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: '08:00'
+  open-pull-requests-limit: 99

.github/workflows/build-test.yml

@@ -8,6 +8,9 @@ on:
     branches:
       - trunk
 
+permissions:
+  contents: read
+
 jobs:
   build-and-test:
     # Skip job based on the commit message, only works in push to branches for now
@@ -18,11 +21,11 @@ jobs:
       matrix:
         use-random-user: [false, true]
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Output Docker info
         run: docker info
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3.1.2
         with:
           python-version: 3.8
       - name: Get branch name (only for push to branch)

.github/workflows/deploy.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -51,25 +51,25 @@ jobs:
           DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
           DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
       - name: Deploy new images
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@e88a9994b039653512d697de1bce46b00bfe11b5 # v2
         with:
           timeout_minutes: 20
           max_attempts: 3
           command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make release
       - name: Tag images as latest
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@e88a9994b039653512d697de1bce46b00bfe11b5 # v2
         with:
           timeout_minutes: 20
           max_attempts: 3
           command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make tag_latest
       - name: Deploy latest tag
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@e88a9994b039653512d697de1bce46b00bfe11b5 # v2
         with:
           timeout_minutes: 20
           max_attempts: 3
           command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make release_latest
       - name: Tag browser images
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@e88a9994b039653512d697de1bce46b00bfe11b5 # v2
         with:
           timeout_minutes: 20
           max_attempts: 3
@@ -80,7 +80,7 @@ jobs:
           git config --local user.name "Selenium CI Bot"
           git commit -m "Update tag in docs and files [skip ci]" -a
       - name: Push changes
-        uses: ad-m/github-push-action@master
+        uses: ad-m/github-push-action@a3fd843e49cd58d296bdd2431c4853569a1b900f # master
         with:
           github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
           branch: trunk

.github/workflows/lock.yml

@@ -14,7 +14,7 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v2
+      - uses: dessant/lock-threads@e460dfeb36e731f3aeb214be6b0c9a9d9a67eda6 # v3
         with:
           process-only: 'issues'
           issue-lock-inactive-days: '30'

.github/workflows/test-video.yml

@@ -8,18 +8,21 @@ on:
     branches:
       - trunk
 
+permissions:
+  contents: read
+
 jobs:
   build-and-test:
     # Skip job based on the commit message, only works in push to branches for now
     if: contains(toJson(github.event.commits), '[skip ci]') == false
     name: Test video recorded through Docker Selenium
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Output Docker info
         run: docker info
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3.1.2
         with:
           python-version: 3.8
       - name: Get branch name (only for push to branch)
@@ -39,17 +42,17 @@ jobs:
       - name: Run Docker Compose to record video
         run: USE_RANDOM_USER_ID=${USE_RANDOM_USER} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make test_video
       - name: Upload recorded Chrome video
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: chrome_video
           path: ./tests/videos/chrome_video.mp4
       - name: Upload recorded Edge video
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: edge_video
           path: ./tests/videos/edge_video.mp4
       - name: Upload recorded Firefox video
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: firefox_video
           path: ./tests/videos/firefox_video.mp4

Base/Dockerfile

@@ -2,6 +2,7 @@
 #FROM ubuntu:focal-20210827
 #FROM ubuntu:focal-20211006
 #FROM ubuntu:focal-20220302
+#FROM ubuntu:focal-20220415
 FROM debian:latest
 LABEL authors="Selenium <[email protected]>"
 
@@ -88,7 +89,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.1.0/selenium-server-4.1.3.jar \
+  && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.1.0/selenium-server-4.1.4.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.1.3-20220327
+FROM selenium/base:4.1.4-20220427
 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.1.3-20220327
+FROM selenium/base:4.1.4-20220427
 LABEL authors=SeleniumHQ
 
 USER 1200

NodeBase/Dockerfile

@@ -2,8 +2,13 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+<<<<<<< HEAD
 FROM seleniarm/base:4.1.3-20220331
 LABEL authors=SeleniumHQ,sj26,jamesmortensen
+=======
+FROM selenium/base:4.1.4-20220427
+LABEL authors=SeleniumHQ
+>>>>>>> 379c1ff51523d6ac236f1331de7261c0c732451e
 
 USER root
 
@@ -180,6 +185,9 @@ ENV START_NO_VNC true
 # Path to the Configfile
 ENV CONFIG_FILE=/opt/selenium/config.toml
 ENV GENERATE_CONFIG true
+# Drain the Node after N sessions. 
+# A value higher than zero enables the feature
+ENV DRAIN_AFTER_SESSION_COUNT 0
 
 #========================
 # Selenium Configuration