Skip to content

Commit 978c050

Browse files
authored
Update Selenium Grid 4.27.0 and dependencies (#2478)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 7727b6d commit 978c050

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ jobs:
205205
prerelease: ${{ env.PRERELEASE }}
206206
draft: false
207207
append_body: false
208+
discussion_category_name: "Announcements"
208209
files: |
209210
package_versions.txt
210211
${{ env.PUBLISH_YAML_MANIFESTS }}

Base/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ LABEL org.opencontainers.image.source="https://github.com/${AUTHORS}/docker-sele
77
ARG VERSION
88
ARG RELEASE=selenium-${VERSION}
99
# Default value should be aligned with upstream Selenium (https://github.com/SeleniumHQ/selenium/blob/trunk/MODULE.bazel)
10-
ARG OPENTELEMETRY_VERSION=1.43.0
11-
ARG GRPC_VERSION=1.68.0
10+
ARG OPENTELEMETRY_VERSION=1.44.1
11+
ARG GRPC_VERSION=1.68.1
1212
ARG NETTY_VERSION=4.1.115.Final
13-
ARG CS_VERSION=2.1.13
13+
ARG CS_VERSION=2.1.18
1414

1515
#Arguments to define the user running Selenium
1616
ARG SEL_USER=seluser

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
NAME := $(or $(NAME),$(NAME),selenium)
22
CURRENT_DATE := $(shell date '+%Y%m%d')
33
BUILD_DATE := $(or $(BUILD_DATE),$(BUILD_DATE),$(CURRENT_DATE))
4-
BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.26.0)
5-
BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.26.0)
6-
BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.26.1)
4+
BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.27.0)
5+
BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.27.0)
6+
BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.27.0)
77
BASE_RELEASE_NIGHTLY := $(or $(BASE_RELEASE_NIGHTLY),$(BASE_RELEASE_NIGHTLY),nightly)
8-
BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.27.0-SNAPSHOT)
9-
VERSION := $(or $(VERSION),$(VERSION),4.26.0)
8+
BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.28.0-SNAPSHOT)
9+
VERSION := $(or $(VERSION),$(VERSION),4.27.0)
1010
TAG_VERSION := $(VERSION)-$(BUILD_DATE)
1111
CHART_VERSION_NIGHTLY := $(or $(CHART_VERSION_NIGHTLY),$(CHART_VERSION_NIGHTLY),1.0.0-nightly)
1212
NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))

NodeBase/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ ARG AUTHORS
55
LABEL authors=${AUTHORS}
66

77
# Inputs: heads, tags
8-
ARG NOVNC_SOURCE="heads"
8+
ARG NOVNC_SOURCE="tags"
99
# Inputs: master, "v1.4.0"
10-
ARG NOVNC_VERSION="master"
10+
ARG NOVNC_VERSION="v1.5.0"
1111
# Inputs: heads, tags
12-
ARG WEBSOCKIFY_SOURCE="heads"
12+
ARG WEBSOCKIFY_SOURCE="tags"
1313
# Inputs: master, "v0.11.0"
14-
ARG WEBSOCKIFY_VERSION="master"
14+
ARG WEBSOCKIFY_VERSION="v0.12.0"
1515
ARG LANG_WHICH=en
1616
ARG LANG_WHERE=US
1717
ARG ENCODING=UTF-8
@@ -111,23 +111,23 @@ RUN --mount=type=secret,id=SEL_PASSWD \
111111
&& wget -nv -O noVNC.zip \
112112
"https://github.com/novnc/noVNC/archive/refs/${NOVNC_SOURCE}/${NOVNC_VERSION}.zip" \
113113
&& unzip -x noVNC.zip \
114-
&& mv noVNC-${NOVNC_VERSION} /opt/bin/noVNC \
114+
&& mv noVNC-${NOVNC_VERSION#v} /opt/bin/noVNC \
115115
&& cp /opt/bin/noVNC/vnc.html /opt/bin/noVNC/index.html \
116116
&& rm noVNC.zip \
117117
&& wget -nv -O websockify.zip \
118118
"https://github.com/novnc/websockify/archive/refs/${WEBSOCKIFY_SOURCE}/${WEBSOCKIFY_VERSION}.zip" \
119119
&& unzip -x websockify.zip \
120120
&& rm websockify.zip \
121121
# Setup dependencies
122-
&& cd websockify-${WEBSOCKIFY_VERSION} \
122+
&& cd websockify-${WEBSOCKIFY_VERSION#v} \
123123
&& python3 setup.py install \
124124
# Move websockify and run to the noVNC directory
125125
&& mv websockify /opt/bin/noVNC/utils/websockify \
126126
&& mv run /opt/bin/noVNC/utils/websockify \
127127
&& chmod +x /opt/bin/noVNC/utils/websockify/run \
128128
# Cleanup unnecessary files
129129
&& cd .. \
130-
&& rm -rf websockify-${WEBSOCKIFY_VERSION} \
130+
&& rm -rf websockify-${WEBSOCKIFY_VERSION#v} \
131131
#========================================================================
132132
# Run this command for executable file permissions for /dev/shm when #
133133
# this is a "child" container running in Docker Desktop and WSL2 distro #

NodeChromium/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ USER root
99
# Install Chromium
1010
ARG CHROMIUM_VERSION="latest"
1111
ARG CHROMIUM_DEB_SITE="http://deb.debian.org/debian"
12-
RUN echo "deb ${CHROMIUM_DEB_SITE}/ stable main" >> /etc/apt/sources.list \
12+
RUN echo "deb ${CHROMIUM_DEB_SITE}/ sid main" >> /etc/apt/sources.list \
1313
&& wget -qO- https://ftp-master.debian.org/keys/archive-key-12.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/debian-archive-keyring.gpg \
1414
&& 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 \
1515
&& apt-get update -qqy \

0 commit comments

Comments
 (0)