Skip to content

Commit 68cfb93

Browse files
authored
Docker: Fix CVEs in dependencies (#2675)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent ceffc53 commit 68cfb93

File tree

7 files changed

+18
-13
lines changed

7 files changed

+18
-13
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
runs-on: ubuntu-24.04
6161
permissions: write-all
6262
strategy:
63+
max-parallel: 1
6364
fail-fast: false
6465
matrix:
6566
browser-version: ${{ fromJSON(github.event.inputs.browser-versions)}}
@@ -106,8 +107,6 @@ jobs:
106107
run: |
107108
echo ${GRID_VERSION}
108109
echo "GRID_VERSION=${GRID_VERSION}" >> "$GITHUB_OUTPUT"
109-
- name: Create CHANGELOG directory
110-
run: mkdir -p ./CHANGELOG/${{ env.GRID_VERSION }}
111110
- name: Login Docker Hub
112111
run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
113112
env:

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
runs-on: ubuntu-24.04
6161
permissions: write-all
6262
strategy:
63+
max-parallel: 1
6364
fail-fast: false
6465
matrix:
6566
browser-version: ${{ fromJSON(github.event.inputs.browser-versions)}}
@@ -106,8 +107,6 @@ jobs:
106107
run: |
107108
echo ${GRID_VERSION}
108109
echo "GRID_VERSION=${GRID_VERSION}" >> "$GITHUB_OUTPUT"
109-
- name: Create CHANGELOG directory
110-
run: mkdir -p ./CHANGELOG/${{ env.GRID_VERSION }}
111110
- name: Login Docker Hub
112111
run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
113112
env:
@@ -162,6 +161,8 @@ jobs:
162161
echo "GRID_VERSION=${GRID_VERSION}" >> $GITHUB_ENV
163162
env:
164163
GRID_VERSION: ${{ needs.deploy.outputs.GRID_VERSION }}
164+
- name: Create CHANGELOG directory
165+
run: mkdir -p ./CHANGELOG/${{ env.GRID_VERSION }}
165166
- name: Download results
166167
uses: actions/download-artifact@v4
167168
with:

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
runs-on: ubuntu-24.04
6161
permissions: write-all
6262
strategy:
63+
max-parallel: 1
6364
fail-fast: false
6465
matrix:
6566
browser-version: ${{ fromJSON(github.event.inputs.browser-versions)}}
@@ -106,8 +107,6 @@ jobs:
106107
run: |
107108
echo ${GRID_VERSION}
108109
echo "GRID_VERSION=${GRID_VERSION}" >> "$GITHUB_OUTPUT"
109-
- name: Create CHANGELOG directory
110-
run: mkdir -p ./CHANGELOG/${{ env.GRID_VERSION }}
111110
- name: Login Docker Hub
112111
run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
113112
env:
@@ -162,6 +161,8 @@ jobs:
162161
echo "GRID_VERSION=${GRID_VERSION}" >> $GITHUB_ENV
163162
env:
164163
GRID_VERSION: ${{ needs.deploy.outputs.GRID_VERSION }}
164+
- name: Create CHANGELOG directory
165+
run: mkdir -p ./CHANGELOG/${{ env.GRID_VERSION }}
165166
- name: Download results
166167
uses: actions/download-artifact@v4
167168
with:

Base/Dockerfile

+6-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ ARG RELEASE=selenium-${VERSION}
99
ARG MVN_SELENIUM_VERSION
1010
# Default value should be aligned with upstream Selenium (https://github.com/SeleniumHQ/selenium/blob/trunk/MODULE.bazel)
1111
ARG OPENTELEMETRY_VERSION=1.46.0
12-
ARG GRPC_VERSION=1.69.0
13-
ARG NETTY_VERSION=4.1.117.Final
12+
ARG GRPC_VERSION=1.70.0
13+
ARG NETTY_VERSION=4.1.118.Final
1414
ARG CS_VERSION=2.1.18
1515
ARG POSTGRESQL_VERSION=42.7.5
16-
ARG ENVSUBST_VERSION=1.4.2
16+
ARG ENVSUBST_VERSION=1.4.2-patch.124
1717

1818
#Arguments to define the user running Selenium
1919
ARG SEL_USER=seluser
@@ -122,6 +122,8 @@ RUN --mount=type=secret,id=SEL_PASSWD \
122122
io.opentelemetry:opentelemetry-exporter-otlp:${OPENTELEMETRY_VERSION} \
123123
io.grpc:grpc-netty:${GRPC_VERSION} \
124124
io.netty:netty-codec-http:${NETTY_VERSION} \
125+
io.netty:netty-handler:${NETTY_VERSION} \
126+
io.netty:netty-common:${NETTY_VERSION} \
125127
> /external_jars/.classpath.txt \
126128
&& chmod 664 /external_jars/.classpath.txt \
127129
&& java -jar /tmp/cs fetch --classpath --cache /external_jars \
@@ -159,7 +161,7 @@ COPY --chown="${SEL_UID}:${SEL_GID}" certs/tls.crt certs/tls.key certs/server.jk
159161
# Add envsubst binary
160162
#===================================================
161163
RUN ARCH=$(if [ "$(dpkg --print-architecture)" = "amd64" ]; then echo "x86_64"; else echo "$(dpkg --print-architecture)"; fi) \
162-
&& curl -fsSL https://github.com/a8m/envsubst/releases/download/v${ENVSUBST_VERSION}/envsubst-$(uname -s)-${ARCH} -o envsubst \
164+
&& curl -fsSL https://github.com/NDViet/envsubst/releases/download/v${ENVSUBST_VERSION}/envsubst-$(uname -s)-${ARCH} -o envsubst \
163165
&& chmod +x envsubst \
164166
&& mv envsubst /usr/local/bin \
165167
&& ln -sf /usr/local/bin/envsubst /usr/bin/envsubst

tests/build-backward-compatible/bootstrap.sh

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ IFS=',' read -ra VERSION_LIST <<< "$CDP_VERSIONS"
2424

2525
mkdir -p CHANGELOG/${SELENIUM_VERSION}
2626

27+
python3 tests/build-backward-compatible/fetch_version.py
28+
2729
for CDP_VERSION in "${VERSION_LIST[@]}"; do
2830
python3 tests/build-backward-compatible/builder.py ${SELENIUM_VERSION} ${CDP_VERSION} ${BROWSER}
2931
export $(cat .env | xargs)

tests/build-backward-compatible/browser-matrix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
matrix:
22
browser:
33
'135':
4-
FIREFOX_VERSION: null
4+
FIREFOX_VERSION: 135.0.1
55
FIREFOX_DOWNLOAD_URL: https://download-installer.cdn.mozilla.net/pub/firefox/nightly/2025/01/2025-01-06-09-47-46-mozilla-central/firefox-135.0a1.en-US.linux-aarch64.deb
66
FIREFOX_PLATFORMS: linux/amd64,linux/arm64
77
'134':

tests/charts/make/chart_setup_env.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ GOBIN=$HOME/go/bin go install github.com/norwoodj/helm-docs/cmd/helm-docs@latest
171171
$HOME/go/bin/helm-docs -h || true
172172
echo "==============================="
173173
echo "Installing envsubst for AMD64 / ARM64"
174-
ENVSUBST_VERSION="v1.4.2"
174+
ENVSUBST_VERSION="1.4.2-patch.124"
175175
ARCH=$(if [ "$(dpkg --print-architecture)" = "amd64" ]; then echo "x86_64"; else echo "$(dpkg --print-architecture)"; fi)
176-
curl -fsSL https://github.com/a8m/envsubst/releases/download/${ENVSUBST_VERSION}/envsubst-$(uname -s)-${ARCH} -o envsubst
176+
curl -fsSL https://github.com/NDViet/envsubst/releases/download/v${ENVSUBST_VERSION}/envsubst-$(uname -s)-${ARCH} -o envsubst
177177
chmod +x envsubst
178178
sudo mv envsubst /usr/local/bin
179179
sudo ln -sf /usr/local/bin/envsubst /usr/bin/envsubst

0 commit comments

Comments
 (0)