Skip to content

Commit

Permalink
Update Selenium Grid 4.27.0 and dependencies (#2478)
Browse files Browse the repository at this point in the history
Signed-off-by: Viet Nguyen Duc <[email protected]>
  • Loading branch information
VietND96 authored Nov 27, 2024
1 parent 7727b6d commit 978c050
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 16 deletions.
1 change: 1 addition & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
6 changes: 3 additions & 3 deletions Base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
14 changes: 7 additions & 7 deletions NodeBase/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -111,23 +111,23 @@ 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 \
"https://github.com/novnc/websockify/archive/refs/${WEBSOCKIFY_SOURCE}/${WEBSOCKIFY_VERSION}.zip" \
&& 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 \
&& mv run /opt/bin/noVNC/utils/websockify \
&& 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 #
Expand Down
2 changes: 1 addition & 1 deletion NodeChromium/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 978c050

Please sign in to comment.