Resolved conflicts

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.0-20211209? Please use the full tag, avoid "latest"
+      placeholder: 4.1.2-20220217? Please use the full tag, avoid "latest"
     validations:
       required: true

.github/workflows/deploy.yml

@@ -45,6 +45,35 @@ jobs:
         run: ./update_tag_in_docs_and_files.sh ${LATEST_TAG} ${NEXT_TAG}
       - name: Build images
         run: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make build
+      - name: Login Docker Hub
+        run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+        env:
+          DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
+          DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+      - name: Deploy new images
+        uses: nick-invision/retry@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
+        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
+        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
+        with:
+          timeout_minutes: 20
+          max_attempts: 3
+          command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} PUSH_IMAGE=true make tag_and_push_browser_images
       - name: Commit files
         run: |
           git config --local user.email "[email protected]"
@@ -55,19 +84,6 @@ jobs:
         with:
           github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
           branch: trunk
-      - name: Login Docker Hub
-        run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-        env:
-          DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
-          DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
-      - name: Deploy new images
-        run: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make release
-      - name: Tag images as latest
-        run: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make tag_latest
-      - name: Deploy latest tag
-        run: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make release_latest
-      - name: Tag browser images
-        run: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} PUSH_IMAGE=true make tag_and_push_browser_images
       - name: Create release notes (release_notes.md)
         run: ./generate_release_notes.sh ${LATEST_TAG} origin/trunk ${GRID_VERSION} ${BUILD_DATE}
       - name: Create Release

.github/workflows/k8s-deploy-test.yml

@@ -1,12 +1,7 @@
 name: "Test Selenium Grid 4 deployment on Minikube Cluster"
 
 on:
-  push:
-    branches:
-      - trunk
-  pull_request:
-    branches:
-      - trunk
+  workflow_dispatch:
 
 jobs:
   deploy:
@@ -18,10 +13,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.3.0
+        uses: manusa/actions-setup-minikube@v2.4.3
         with:
-          minikube version: "v1.13.1"
-          kubernetes version: "v1.19.2"
+          minikube version: 'v1.24.0'
+          kubernetes version: 'v1.23.0'
           github token: ${{ secrets.GITHUB_TOKEN }}
           driver: none
       - name: Interact with Minikube

Base/Dockerfile

@@ -78,7 +78,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.0.jar \
+  && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.1.0/selenium-server-4.1.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
@@ -88,5 +88,9 @@ RUN  mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/su
 #===================================================
 USER 1200:1201
 
+# Boolean value, maps "--bind-host"
+ENV SE_BIND_HOST false
+
+
 
 CMD ["/opt/bin/entry_point.sh"]

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.0-20211209
+FROM selenium/base:4.1.2-20220217
 LABEL authors=SeleniumHQ
 
 USER 1200

Distributor/start-selenium-grid-distributor.sh

@@ -60,6 +60,7 @@ java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar distributor \
   --sessionqueue-host "${SE_SESSION_QUEUE_HOST}" --sessionqueue-port "${SE_SESSION_QUEUE_PORT}" \
   --publish-events tcp://"${SE_EVENT_BUS_HOST}":"${SE_EVENT_BUS_PUBLISH_PORT}" \
   --subscribe-events tcp://"${SE_EVENT_BUS_HOST}":"${SE_EVENT_BUS_SUBSCRIBE_PORT}" \
+  --bind-host ${SE_BIND_HOST} \
   --bind-bus false \
   ${HOST_CONFIG} \
   ${PORT_CONFIG} \

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.0-20211209
+FROM selenium/base:4.1.2-20220217
 LABEL authors=SeleniumHQ
 
 USER 1200

EventBus/start-selenium-grid-eventbus.sh

@@ -20,6 +20,7 @@ if [ ! -z "$SE_OPTS" ]; then
 fi
 
 java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar event-bus \
+  --bind-host ${SE_BIND_HOST} \
   ${HOST_CONFIG} \
   ${PORT_CONFIG} \
   ${SE_OPTS}

Hub/Dockerfile

@@ -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 5
+ENV SE_SESSION_RETRY_INTERVAL 0
 # 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 5
+ENV SE_SESSION_RETRY_INTERVAL 0
 # Boolean value, maps "--relax-checks"
 ENV SE_RELAX_CHECKS true