From 978c05021c07bf2c86b7467cbdcb05bcc03ec3cc Mon Sep 17 00:00:00 2001
From: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
Date: Wed, 27 Nov 2024 07:21:56 +0700
Subject: [PATCH] Update Selenium Grid 4.27.0 and dependencies (#2478)

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
---
 .github/workflows/deploy.yml |  1 +
 Base/Dockerfile              |  6 +++---
 Makefile                     | 10 +++++-----
 NodeBase/Dockerfile          | 14 +++++++-------
 NodeChromium/Dockerfile      |  2 +-
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 8ecb7fe70..9cd1e132f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -205,6 +205,7 @@ jobs:
           prerelease: ${{ env.PRERELEASE }}
           draft: false
           append_body: false
+          discussion_category_name: "Announcements"
           files: |
             package_versions.txt
             ${{ env.PUBLISH_YAML_MANIFESTS }}
diff --git a/Base/Dockerfile b/Base/Dockerfile
index 3fefce765..bf6d4ffd0 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -7,10 +7,10 @@ LABEL org.opencontainers.image.source="https://github.com/${AUTHORS}/docker-sele
 ARG VERSION
 ARG RELEASE=selenium-${VERSION}
 # Default value should be aligned with upstream Selenium (https://github.com/SeleniumHQ/selenium/blob/trunk/MODULE.bazel)
-ARG OPENTELEMETRY_VERSION=1.43.0
-ARG GRPC_VERSION=1.68.0
+ARG OPENTELEMETRY_VERSION=1.44.1
+ARG GRPC_VERSION=1.68.1
 ARG NETTY_VERSION=4.1.115.Final
-ARG CS_VERSION=2.1.13
+ARG CS_VERSION=2.1.18
 
 #Arguments to define the user running Selenium
 ARG SEL_USER=seluser
diff --git a/Makefile b/Makefile
index 0c9fd55f3..f9e6dc48e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 NAME := $(or $(NAME),$(NAME),selenium)
 CURRENT_DATE := $(shell date '+%Y%m%d')
 BUILD_DATE := $(or $(BUILD_DATE),$(BUILD_DATE),$(CURRENT_DATE))
-BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.26.0)
-BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.26.0)
-BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.26.1)
+BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.27.0)
+BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.27.0)
+BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.27.0)
 BASE_RELEASE_NIGHTLY := $(or $(BASE_RELEASE_NIGHTLY),$(BASE_RELEASE_NIGHTLY),nightly)
-BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.27.0-SNAPSHOT)
-VERSION := $(or $(VERSION),$(VERSION),4.26.0)
+BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.28.0-SNAPSHOT)
+VERSION := $(or $(VERSION),$(VERSION),4.27.0)
 TAG_VERSION := $(VERSION)-$(BUILD_DATE)
 CHART_VERSION_NIGHTLY := $(or $(CHART_VERSION_NIGHTLY),$(CHART_VERSION_NIGHTLY),1.0.0-nightly)
 NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile
index 7cf22070c..7229a4ce5 100644
--- a/NodeBase/Dockerfile
+++ b/NodeBase/Dockerfile
@@ -5,13 +5,13 @@ ARG AUTHORS
 LABEL authors=${AUTHORS}
 
 # Inputs: heads, tags
-ARG NOVNC_SOURCE="heads"
+ARG NOVNC_SOURCE="tags"
 # Inputs: master, "v1.4.0"
-ARG NOVNC_VERSION="master"
+ARG NOVNC_VERSION="v1.5.0"
 # Inputs: heads, tags
-ARG WEBSOCKIFY_SOURCE="heads"
+ARG WEBSOCKIFY_SOURCE="tags"
 # Inputs: master, "v0.11.0"
-ARG WEBSOCKIFY_VERSION="master"
+ARG WEBSOCKIFY_VERSION="v0.12.0"
 ARG LANG_WHICH=en
 ARG LANG_WHERE=US
 ARG ENCODING=UTF-8
@@ -111,7 +111,7 @@ RUN --mount=type=secret,id=SEL_PASSWD \
   && wget -nv -O noVNC.zip \
        "https://github.com/novnc/noVNC/archive/refs/${NOVNC_SOURCE}/${NOVNC_VERSION}.zip" \
   && unzip -x noVNC.zip \
-  && mv noVNC-${NOVNC_VERSION} /opt/bin/noVNC \
+  && mv noVNC-${NOVNC_VERSION#v} /opt/bin/noVNC \
   && cp /opt/bin/noVNC/vnc.html /opt/bin/noVNC/index.html \
   && rm noVNC.zip \
   && wget -nv -O websockify.zip \
@@ -119,7 +119,7 @@ RUN --mount=type=secret,id=SEL_PASSWD \
   && unzip -x websockify.zip \
   && rm websockify.zip \
   # Setup dependencies
-  && cd websockify-${WEBSOCKIFY_VERSION} \
+  && cd websockify-${WEBSOCKIFY_VERSION#v} \
   && python3 setup.py install \
   # Move websockify and run to the noVNC directory
   && mv websockify /opt/bin/noVNC/utils/websockify \
@@ -127,7 +127,7 @@ RUN --mount=type=secret,id=SEL_PASSWD \
   && chmod +x /opt/bin/noVNC/utils/websockify/run \
   # Cleanup unnecessary files
   && cd .. \
-  && rm -rf websockify-${WEBSOCKIFY_VERSION} \
+  && rm -rf websockify-${WEBSOCKIFY_VERSION#v} \
 #========================================================================
 # Run this command for executable file permissions for /dev/shm when    #
 # this is a "child" container running in Docker Desktop and WSL2 distro #
diff --git a/NodeChromium/Dockerfile b/NodeChromium/Dockerfile
index 0bba4f2dc..dbdd0edd2 100644
--- a/NodeChromium/Dockerfile
+++ b/NodeChromium/Dockerfile
@@ -9,7 +9,7 @@ USER root
 # Install Chromium
 ARG CHROMIUM_VERSION="latest"
 ARG CHROMIUM_DEB_SITE="http://deb.debian.org/debian"
-RUN echo "deb ${CHROMIUM_DEB_SITE}/ stable main" >> /etc/apt/sources.list \
+RUN echo "deb ${CHROMIUM_DEB_SITE}/ sid main" >> /etc/apt/sources.list \
   && wget -qO- https://ftp-master.debian.org/keys/archive-key-12.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/debian-archive-keyring.gpg \
   && wget -qO- https://ftp-master.debian.org/keys/archive-key-12-security.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/debian-archive-security-keyring.gpg \
   && apt-get update -qqy \