Skip to content
This repository was archived by the owner on Jun 22, 2024. It is now read-only.

Commit d384913

Browse files
jamesmortensenjamesmortensen
committed
merge from trunk
2 parents 7754dc7 + 9afad2d commit d384913

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+221
-170
lines changed

‎.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
DEPLOY_BRANCH: trunk
118118
GITHUB_USER: seleniumhq-community
119119
GITHUB_REPO: docker-seleniarm
120-
SELENIUM_VERSION: 4.1.4
120+
SELENIUM_VERSION: 4.2.1
121121
steps:
122122
- run:
123123
name: "Prepare workflow environment variables"
@@ -212,4 +212,4 @@ workflows:
212212

213213

214214

215-
215+

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ body:
5555
attributes:
5656
label: Docker Selenium version (tag)
5757
description: What version of Docker Selenium are you using?
58-
placeholder: 4.1.4-20220427? Please use the full tag, avoid "latest"
58+
placeholder: 4.2.1-20220531? Please use the full tag, avoid "latest"
5959
validations:
6060
required: true

‎.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Sets env var for the next tag
3939
run: echo "NEXT_TAG=${GRID_VERSION}-${BUILD_DATE}" >> $GITHUB_ENV
4040
- name: Get latest tag
41-
run: echo "LATEST_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
41+
run: echo "LATEST_TAG=$(git tag --sort=-version:refname | grep "^[^selenium]" | head -n 1)" >> $GITHUB_ENV
4242
- name: Display latest tag
4343
run: echo ${LATEST_TAG}
4444
- name: Update tag in docs and files

‎.github/workflows/helm-chart-release.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Release Charts
2+
3+
on:
4+
push:
5+
branches:
6+
- trunk
7+
paths:
8+
- 'charts/selenium-grid/Chart.yaml'
9+
10+
jobs:
11+
release:
12+
runs-on: ubuntu-latest
13+
permissions: write-all
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
with:
18+
fetch-depth: 0
19+
20+
- name: Configure Git
21+
run: |
22+
git config user.name "$GITHUB_ACTOR"
23+
git config user.email "[email protected]"
24+
25+
- name: Run chart-releaser
26+
uses: helm/[email protected]
27+
env:
28+
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

‎Base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ COPY supervisord.conf /etc
8989
RUN mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
9090
&& touch /opt/selenium/config.toml \
9191
&& chmod -R 777 /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor /etc/passwd \
92-
&& wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.1.0/selenium-server-4.1.4.jar \
92+
&& wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.2.0/selenium-server-4.2.1.jar \
9393
-O /opt/selenium/selenium-server.jar \
9494
&& chgrp -R 0 /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
9595
&& chmod -R g=u /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor

‎Distributor/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:4.1.4-20220427
5+
FROM selenium/base:4.2.1-20220531
66
LABEL authors=SeleniumHQ
77

88
USER 1200

‎EventBus/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:4.1.4-20220427
5+
FROM selenium/base:4.2.1-20220531
66
LABEL authors=SeleniumHQ
77

88
USER 1200

‎Hub/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM seleniarm/base:4.1.4-20220429
5+
FROM selenium/base:4.2.1-20220531
66
LABEL authors=SeleniumHQ
77

88
USER 1200

‎NodeBase/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM seleniarm/base:4.1.4-20220429
5+
FROM selenium/base:4.2.1-20220531
66
LABEL authors=SeleniumHQ
77

88
USER root

‎NodeChrome/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-base:4.1.4-20220427
5+
FROM selenium/node-base:4.2.1-20220531
66
LABEL authors=SeleniumHQ
77

88
USER root

‎NodeDocker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:4.1.4-20220427
5+
FROM selenium/base:4.2.1-20220531
66
LABEL authors=SeleniumHQ
77

88
USER root

‎NodeDocker/config.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Configs have a mapping between the Docker image to use and the capabilities that need to be matched to
33
# start a container with the given image.
44
configs = [
5-
"selenium/standalone-firefox:4.1.4-20220427", '{"browserName": "firefox", "platformName": "linux"}',
6-
"selenium/standalone-chrome:4.1.4-20220427", '{"browserName": "chrome", "platformName": "linux"}',
7-
"selenium/standalone-edge:4.1.4-20220427", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
5+
"selenium/standalone-firefox:4.2.1-20220531", '{"browserName": "firefox", "platformName": "linux"}',
6+
"selenium/standalone-chrome:4.2.1-20220531", '{"browserName": "chrome", "platformName": "linux"}',
7+
"selenium/standalone-edge:4.2.1-20220531", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
88
]
99

1010
# URL for connecting to the docker daemon
@@ -14,7 +14,7 @@ configs = [
1414
# socat -4 TCP-LISTEN:2375,fork UNIX-CONNECT:/var/run/docker.sock
1515
url = "http://127.0.0.1:2375"
1616
# Docker image used for video recording
17-
video-image = "selenium/video:ffmpeg-4.3.1-20220427"
17+
video-image = "selenium/video:ffmpeg-4.3.1-20220531"
1818

1919
# Uncomment the following section if you are running the node on a separate VM
2020
# Fill out the placeholders with appropriate values

‎NodeEdge/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-base:4.1.4-20220427
5+
FROM selenium/node-base:4.2.1-20220531
66
LABEL authors=SeleniumHQ
77

88
USER root

‎NodeFirefox/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
FROM seleniarm/node-base:4.1.4-20220429
66
LABEL authors=SeleniumHQ
77

8-
#FROM local-seleniarm/node-base:4.0.0-20211018
9-
#LABEL authors=SeleniumHQ,sj26,jamesmortensen
10-
118
ARG TARGETARCH
129
ARG TARGETVARIANT
1310

‎NodeFirefox/Dockerfile.arm64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ USER root
2121
RUN echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list \
2222
&& apt-get update -qqy \
2323
&& apt-get install libavcodec-extra -y \
24-
&& wget https://snapshot.debian.org/archive/debian/20220418T084218Z/pool/main/f/firefox/firefox_99.0-1_`dpkg --print-architecture`.deb -O firefox.deb \
24+
&& wget https://snapshot.debian.org/archive/debian/20220602T030029Z/pool/main/f/firefox/firefox_100.0.2-1_`dpkg --print-architecture`.deb -O firefox.deb \
2525
&& apt install ./firefox.deb -y \
2626
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* ./firefox.deb
2727

0 commit comments

Comments
 (0)