Skip to content

Commit 117c1cb

Browse files
VietND96VietND96
authored
Merge branch 'trunk' into tools-image
Signed-off-by: Viet Nguyen Duc <[email protected]>
2 parents 6bbe1a5 + 9f563f1 commit 117c1cb

Some content is hidden

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

50 files changed

+391
-356
lines changed

‎.ffmpeg/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:noble AS builder
22
ARG FFMPEG_VERSION="8.0"
3-
ARG RCLONE_VER="v1.71.0"
3+
ARG RCLONE_VER="v1.71.1"
44
ARG GO_VERSION="latest"
55
#ARG GO_CRYPTO_VERSION="v0.36.0"
66
#ARG GO_OAUTH2_VERSION="v0.27.0"

‎.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.35.0-20250828? Please use the full tag, avoid "latest"
59+
placeholder: 4.35.0-20250909? 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: blacksmith-8vcpu-ubuntu-2204
23+
runs-on: ubuntu-24.04
2424
permissions: write-all
2525
steps:
2626
- name: Checkout code

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- k8s-version: 'v1.34.1'
6363
cluster: 'minikube'
6464
helm-version: 'v3.18.6'
65-
docker-version: '28.3.3'
65+
docker-version: '28.4.0'
6666
python-version: '3.9'
6767
test-upgrade: true
6868
service-mesh: false
@@ -72,7 +72,7 @@ jobs:
7272
- k8s-version: 'v1.28.15'
7373
cluster: 'minikube'
7474
helm-version: 'v3.13.3'
75-
docker-version: '26.1.4'
75+
docker-version: '27.5.1'
7676
python-version: '3.10'
7777
test-upgrade: true
7878
service-mesh: true
@@ -102,7 +102,7 @@ jobs:
102102
- k8s-version: 'v1.31.12'
103103
cluster: 'minikube'
104104
helm-version: 'v3.16.4'
105-
docker-version: '27.4.1'
105+
docker-version: '27.5.1'
106106
python-version: '3.13'
107107
test-upgrade: true
108108
service-mesh: false
@@ -112,7 +112,7 @@ jobs:
112112
- k8s-version: 'v1.32.9'
113113
cluster: 'minikube'
114114
helm-version: 'v3.17.4'
115-
docker-version: '26.1.4'
115+
docker-version: '27.5.1'
116116
python-version: '3.10'
117117
test-upgrade: true
118118
service-mesh: false
@@ -122,7 +122,7 @@ jobs:
122122
- k8s-version: 'v1.33.5'
123123
cluster: 'minikube'
124124
helm-version: 'v3.18.6'
125-
docker-version: '26.1.4'
125+
docker-version: '27.5.1'
126126
python-version: '3.10'
127127
test-upgrade: true
128128
service-mesh: true

‎.github/workflows/k8s-scaling-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
- k8s-version: 'v1.34.1'
8282
cluster: 'minikube'
8383
helm-version: 'v3.18.6'
84-
docker-version: '28.3.3'
84+
docker-version: '28.4.0'
8585
python-version: '3.10'
8686
os: ubuntu-22.04
8787
test-strategy: test_k8s_autoscaling_job_count_strategy_default_with_node_max_sessions
@@ -102,14 +102,14 @@ jobs:
102102
- k8s-version: 'v1.31.12'
103103
cluster: 'minikube'
104104
helm-version: 'v3.16.4'
105-
docker-version: '27.4.1'
105+
docker-version: '27.5.1'
106106
python-version: '3.13'
107107
os: ubuntu-22.04
108108
test-strategy: test_k8s_autoscaling_deployment_count_with_node_max_sessions
109109
- k8s-version: 'v1.32.9'
110110
cluster: 'minikube'
111111
helm-version: 'v3.17.4'
112-
docker-version: '26.1.4'
112+
docker-version: '27.5.1'
113113
python-version: '3.10'
114114
os: ubuntu-22.04
115115
test-strategy: test_k8s_autoscaling_deployment_count

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

Lines changed: 5 additions & 4 deletions
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: '20250828'
25+
default: '20250909'
2626
browser-name:
2727
description: 'Browser name to build. E.g: chrome'
2828
required: true
@@ -164,6 +164,7 @@ jobs:
164164
uses: actions/checkout@main
165165
with:
166166
persist-credentials: false
167+
ref: browser-node-changelog
167168
fetch-depth: 0
168169
- name: Get Grid version
169170
run: |
@@ -195,11 +196,11 @@ jobs:
195196
[ci] Upload CHANGELOG for Node/Standalone ${{ env.BROWSER_NAME }} version with Grid ${{ env.GRID_VERSION }}
196197
197198
Browser versions: ${{ github.event.inputs.browser-versions }}
198-
title: "[ci] CHANGELOG for Node/Standalone ${{ env.BROWSER_NAME }} browser versions with Grid ${{ env.GRID_VERSION }}"
199-
body: "This PR contains the CHANGELOG for Node/Standalone ${{ env.BROWSER_NAME }} with specific browser versions: ${{ github.event.inputs.browser-versions }}"
199+
title: "[ci] CHANGELOG for Node/Standalone browser versions with Grid ${{ env.GRID_VERSION }}"
200+
body: "This PR contains the CHANGELOG for Node/Standalone with backward browser versions"
200201
committer: 'Selenium CI Bot <[email protected]>'
201202
author: 'Selenium CI Bot <[email protected]>'
202-
branch: browser-node-${{ env.BROWSER_NAME }}-changelog
203+
branch: browser-node-changelog
203204
- name: Check outputs
204205
if: ${{ steps.cpr.outputs.pull-request-number }}
205206
run: |

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

Lines changed: 5 additions & 4 deletions
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: '20250828'
25+
default: '20250909'
2626
browser-name:
2727
description: 'Browser name to build. E.g: edge'
2828
required: true
@@ -164,6 +164,7 @@ jobs:
164164
uses: actions/checkout@main
165165
with:
166166
persist-credentials: false
167+
ref: browser-node-changelog
167168
fetch-depth: 0
168169
- name: Get Grid version
169170
run: |
@@ -195,11 +196,11 @@ jobs:
195196
[ci] Upload CHANGELOG for Node/Standalone ${{ env.BROWSER_NAME }} version with Grid ${{ env.GRID_VERSION }}
196197
197198
Browser versions: ${{ github.event.inputs.browser-versions }}
198-
title: "[ci] CHANGELOG for Node/Standalone ${{ env.BROWSER_NAME }} browser versions with Grid ${{ env.GRID_VERSION }}"
199-
body: "This PR contains the CHANGELOG for Node/Standalone ${{ env.BROWSER_NAME }} with specific browser versions: ${{ github.event.inputs.browser-versions }}"
199+
title: "[ci] CHANGELOG for Node/Standalone browser versions with Grid ${{ env.GRID_VERSION }}"
200+
body: "This PR contains the CHANGELOG for Node/Standalone with backward browser versions"
200201
committer: 'Selenium CI Bot <[email protected]>'
201202
author: 'Selenium CI Bot <[email protected]>'
202-
branch: browser-node-${{ env.BROWSER_NAME }}-changelog
203+
branch: browser-node-changelog
203204
- name: Check outputs
204205
if: ${{ steps.cpr.outputs.pull-request-number }}
205206
run: |

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

Lines changed: 6 additions & 5 deletions
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: '20250828'
25+
default: '20250909'
2626
browser-name:
2727
description: 'Browser name to build. E.g: firefox'
2828
required: true
@@ -31,7 +31,7 @@ on:
3131
browser-versions:
3232
description: 'List browser version to build. E.g: [130, 131]'
3333
required: true
34-
default: '[98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141]'
34+
default: '[98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142]'
3535
push-image:
3636
description: 'Push image after testing successfully'
3737
required: true
@@ -164,6 +164,7 @@ jobs:
164164
uses: actions/checkout@main
165165
with:
166166
persist-credentials: false
167+
ref: browser-node-changelog
167168
fetch-depth: 0
168169
- name: Get Grid version
169170
run: |
@@ -195,11 +196,11 @@ jobs:
195196
[ci] Upload CHANGELOG for Node/Standalone ${{ env.BROWSER_NAME }} version with Grid ${{ env.GRID_VERSION }}
196197
197198
Browser versions: ${{ github.event.inputs.browser-versions }}
198-
title: "[ci] CHANGELOG for Node/Standalone ${{ env.BROWSER_NAME }} browser versions with Grid ${{ env.GRID_VERSION }}"
199-
body: "This PR contains the CHANGELOG for Node/Standalone ${{ env.BROWSER_NAME }} with specific browser versions: ${{ github.event.inputs.browser-versions }}"
199+
title: "[ci] CHANGELOG for Node/Standalone browser versions with Grid ${{ env.GRID_VERSION }}"
200+
body: "This PR contains the CHANGELOG for Node/Standalone with backward browser versions"
200201
committer: 'Selenium CI Bot <[email protected]>'
201202
author: 'Selenium CI Bot <[email protected]>'
202-
branch: browser-node-${{ env.BROWSER_NAME }}-changelog
203+
branch: browser-node-changelog
203204
- name: Check outputs
204205
if: ${{ steps.cpr.outputs.pull-request-number }}
205206
run: |

‎Base/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ COPY supervisord.conf /etc
168168
#===================================================
169169
# Add the default self-signed certificate to the bundle CA
170170
#===================================================
171-
ARG CERT_TRUST_ATTR=TCu,Cu,Tu
171+
#ARG CERT_TRUST_ATTR=TCu,Cu,Tu
172172
COPY --chown="${SEL_UID}:${SEL_GID}" certs/add-cert-helper.sh certs/add-jks-helper.sh /opt/bin/
173-
COPY --chown="${SEL_UID}:${SEL_GID}" certs/tls.crt certs/tls.key certs/server.jks certs/server.pass /opt/selenium/secrets/
173+
#COPY --chown="${SEL_UID}:${SEL_GID}" certs/tls.crt certs/tls.key certs/server.jks certs/server.pass /opt/selenium/secrets/
174174

175175
#===================================================
176176
# Add envsubst binary
@@ -194,8 +194,8 @@ RUN python3 -m venv $VENV_PATH \
194194
&& $VENV_PATH/bin/python3 -m pip install --break-system-packages . \
195195
&& rm -rf /tmp/supervisor.zip /tmp/supervisor-main
196196

197-
RUN /opt/bin/add-jks-helper.sh -d /opt/selenium/secrets \
198-
&& /opt/bin/add-cert-helper.sh -d /opt/selenium/secrets ${CERT_TRUST_ATTR}
197+
#RUN /opt/bin/add-jks-helper.sh -d /opt/selenium/secrets \
198+
# && /opt/bin/add-cert-helper.sh -d /opt/selenium/secrets ${CERT_TRUST_ATTR}
199199
#======================================
200200
# Configure environement
201201
#======================================

‎Makefile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ prepare_resources:
139139
rm -rf ./Base/configs/node && mkdir -p ./Base/configs/node && cp -r ./charts/selenium-grid/configs/node ./Base/configs
140140

141141
gen_certs:
142-
rm -rf ./Base/certs && cp -r ./charts/selenium-grid/certs ./Base
143-
./Base/certs/gen-cert-helper.sh -d ./Base/certs
142+
rm -rf ./Base/certs && mkdir -p ./Base/certs && cp -r ./charts/selenium-grid/certs/*.sh ./Base/certs
143+
# ./Base/certs/gen-cert-helper.sh -d ./Base/certs
144144

145145
base: prepare_resources gen_certs
146146
cd ./Base && SEL_PASSWD=$(SEL_PASSWD) docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg VERSION=$(BASE_VERSION) --build-arg RELEASE=$(BASE_RELEASE) --build-arg AUTHORS=$(AUTHORS) \
@@ -302,9 +302,11 @@ all_browsers: node_base
302302
cd .. ; \
303303
cd ./NodeFirefox && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers --build-arg FIREFOX_DOWNLOAD_URL=$(FIREFOX_DOWNLOAD_URL) -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
304304
cd .. ; \
305-
cd ./NodeChrome && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
305+
cd ./NodeChrome && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers -t $(NAME)/node-all-browsers:$(TAG_VERSION) . || true ; \
306306
cd .. ; \
307-
cd ./NodeEdge && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
307+
cd ./NodeEdge && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers -t $(NAME)/node-all-browsers:$(TAG_VERSION) . || true ; \
308+
cd .. ; \
309+
cd ./NodeAllBrowsers && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
308310
cd .. ;
309311

310312
standalone_all_browsers: all_browsers

0 commit comments

Comments
 (0)