Skip to content

Commit 9e2d98f

Browse files
authored
Merge branch 'trunk' into extra-libs
2 parents fd9ea17 + 55240ca commit 9e2d98f

File tree

160 files changed

+2826
-549
lines changed

Some content is hidden

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

160 files changed

+2826
-549
lines changed

.ffmpeg/Dockerfile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
FROM ubuntu:noble AS builder
2-
ARG FFMPEG_VERSION="7.1"
2+
ARG FFMPEG_VERSION="7.1.1"
33
ARG RCLONE_VER="v1.69.1"
44
ARG GO_VERSION="latest"
55
ARG GO_CRYPTO_VERSION="v0.35.0"
66
ARG GO_OAUTH2_VERSION="v0.27.0"
7+
ARG GO_NET_VERSION="v0.36.0"
8+
ARG GOLANG_JWT_V4_VERSION="v4.5.2"
9+
ARG GOLANG_JWT_V5_VERSION="v5.2.2"
710

811
USER root
912

@@ -30,12 +33,15 @@ RUN if [ "${GO_VERSION}" = "latest" ]; then \
3033
&& go version
3134

3235
RUN cd /usr/local/src \
33-
&& git clone https://github.com/rclone/rclone.git \
36+
&& git clone https://github.com/rclone/rclone.git --filter=blob:none \
3437
&& cd rclone \
3538
&& git checkout ${RCLONE_VER} \
3639
# Patch deps version in go.mod to fix CVEs
3740
&& sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
3841
&& sed -i "s|golang.org/x/oauth2 v.*|golang.org/x/oauth2 ${GO_OAUTH2_VERSION}|g" go.mod \
42+
&& sed -i "s|golang.org/x/net v.*|golang.org/x/net ${GO_NET_VERSION}|g" go.mod \
43+
&& sed -i "s|github.com/golang-jwt/jwt/v5 v.*|github.com/golang-jwt/jwt/v5 v5.2.2|g" go.mod \
44+
&& sed -i "s|github.com/golang-jwt/jwt/v4 v.*|github.com/golang-jwt/jwt/v4 v4.5.2|g" go.mod \
3945
&& go mod tidy \
4046
# Build rclone
4147
&& make \
@@ -46,7 +52,7 @@ RUN cd /usr/local/src \
4652
# Install x264 from source
4753
#======================================
4854
RUN cd /usr/local/src \
49-
&& git clone https://code.videolan.org/videolan/x264.git \
55+
&& git clone https://code.videolan.org/videolan/x264.git --filter=blob:none \
5056
&& cd x264 \
5157
&& ./configure --prefix="/usr/local" --enable-static \
5258
&& make \
@@ -56,9 +62,9 @@ RUN cd /usr/local/src \
5662
# Install FFmpeg from source
5763
#======================================
5864
RUN cd /usr/local/src \
59-
&& git clone https://github.com/FFmpeg/FFmpeg.git \
65+
&& git clone https://github.com/FFmpeg/FFmpeg.git --filter=blob:none \
6066
&& cd FFmpeg \
61-
&& git checkout release/${FFMPEG_VERSION} \
67+
&& git checkout n${FFMPEG_VERSION} \
6268
&& rm -rf .git \
6369
&& PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" FFMPEG_VERSION=${FFMPEG_VERSION} ./configure \
6470
--prefix="/usr/local" \

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ body:
5656
attributes:
5757
label: Docker Selenium version (image tag)
5858
description: What version of Docker Selenium are you using?
59-
placeholder: 4.29.0-20250303? Please use the full tag, avoid "latest"
59+
placeholder: 4.30.0-20250323? Please use the full tag, avoid "latest"
6060
validations:
6161
required: true
6262
- type: input

.github/workflows/build-ffmpeg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
jobs:
2121
deploy:
2222
name: Build and Deploy FFmpeg
23-
runs-on: ubuntu-24.04
23+
runs-on: blacksmith-8vcpu-ubuntu-2204
2424
permissions: write-all
2525
steps:
2626
- name: Checkout code

.github/workflows/deploy.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,11 @@ jobs:
5151
- build-test
5252
if: (contains(toJson(github.event.commits), '[deploy]') == true || (github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'true')) && !failure() && !cancelled()
5353
name: Deploy and Release
54-
runs-on: ubuntu-24.04
54+
runs-on: blacksmith-8vcpu-ubuntu-2204
5555
permissions: write-all
5656
steps:
5757
- name: Free Disk Space (Ubuntu)
5858
uses: jlumbroso/free-disk-space@main
59-
with:
60-
tool-cache: false
61-
large-packages: false
6259
- name: Checkout code
6360
uses: actions/checkout@main
6461
with:

.github/workflows/docker-test.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,16 @@ jobs:
172172
- name: Format and lint scripts
173173
run: |
174174
make format_shell_scripts
175+
- name: Disable QEMU
176+
if: matrix.test-strategy == 'test_node_relay' && contains(matrix.os, 'amd') == true
177+
run: echo "DOCKER_ENABLE_QEMU=false >> $GITHUB_ENV"
175178
- name: Set up containerd image store feature
176179
uses: nick-invision/retry@master
177180
with:
178181
timeout_minutes: 10
179182
max_attempts: 3
180183
command: |
181-
make setup_dev_env
184+
DOCKER_ENABLE_QEMU=${DOCKER_ENABLE_QEMU} make setup_dev_env
182185
- name: Output Docker info
183186
run: docker info
184187
- name: Set up Python

.github/workflows/nightly.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,11 @@ jobs:
2424
- build-test
2525
if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && !failure() && !cancelled()
2626
name: Deploy and Release Nightly
27-
runs-on: ubuntu-24.04
27+
runs-on: blacksmith-8vcpu-ubuntu-2204
2828
permissions: write-all
2929
steps:
3030
- name: Free Disk Space (Ubuntu)
3131
uses: jlumbroso/free-disk-space@main
32-
with:
33-
tool-cache: false
34-
large-packages: false
3532
- name: Checkout code
3633
uses: actions/checkout@main
3734
with:

.github/workflows/release-chrome-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
description: 'Build date in format YYYYMMDD. Must provide if reusing base image'
2323
required: false
2424
type: string
25-
default: '20250303'
25+
default: '20250323'
2626
browser-name:
2727
description: 'Browser name to build. E.g: chrome'
2828
required: true

.github/workflows/release-edge-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
description: 'Build date in format YYYYMMDD. Must provide if reusing base image'
2323
required: false
2424
type: string
25-
default: '20250303'
25+
default: '20250323'
2626
browser-name:
2727
description: 'Browser name to build. E.g: edge'
2828
required: true

.github/workflows/release-firefox-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
description: 'Build date in format YYYYMMDD. Must provide if reusing base image'
2323
required: false
2424
type: string
25-
default: '20250303'
25+
default: '20250323'
2626
browser-name:
2727
description: 'Browser name to build. E.g: firefox'
2828
required: true

.keda/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ The stable implementation will be merged to the upstream KEDA repository frequen
1313
Replace the image registry and tag of these KEDA components with the patched image tag:
1414

1515
```bash
16-
docker pull selenium/keda:2.16.1-selenium-grid-20250303
17-
docker pull selenium/keda-metrics-apiserver:2.16.1-selenium-grid-20250303
18-
docker pull selenium/keda-admission-webhooks:2.16.1-selenium-grid-20250303
16+
docker pull selenium/keda:2.16.1-selenium-grid-20250323
17+
docker pull selenium/keda-metrics-apiserver:2.16.1-selenium-grid-20250323
18+
docker pull selenium/keda-admission-webhooks:2.16.1-selenium-grid-20250323
1919
```
2020

2121
Besides that, you also can use image tag `latest` or `nightly`.
@@ -27,15 +27,15 @@ If you are deploying KEDA core using their official Helm [chart](https://github.
2727
keda:
2828
registry: selenium
2929
repository: keda
30-
tag: "2.16.1-selenium-grid-20250303"
30+
tag: "2.16.1-selenium-grid-20250323"
3131
metricsApiServer:
3232
registry: selenium
3333
repository: keda-metrics-apiserver
34-
tag: "2.16.1-selenium-grid-20250303"
34+
tag: "2.16.1-selenium-grid-20250323"
3535
webhooks:
3636
registry: selenium
3737
repository: keda-admission-webhooks
38-
tag: "2.16.1-selenium-grid-20250303"
38+
tag: "2.16.1-selenium-grid-20250323"
3939
```
4040
4141
If you are deployment Selenium Grid chart with `autoscaling.enabled` is `true` (implies installing KEDA sub-chart), KEDA images registry and tag already set in the `values.yaml`. Refer to list [configuration](../charts/selenium-grid/CONFIGURATION.md).

0 commit comments

Comments
 (0)