Skip to content

Commit 1c24c4f

Browse files
authored
Merge pull request #1616 from snyk/fix/update-ubi-base-image
fix: upgrade UBI9 to 9.7
2 parents 0318285 + d237e80 commit 1c24c4f

File tree

2 files changed

+15
-21
lines changed

2 files changed

+15
-21
lines changed

.snyk

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,27 @@
11
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
2-
version: v1.25.0
2+
version: v1.25.1
33
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
44
ignore:
5-
SNYK-JS-BRACES-6838727:
5+
SNYK-JS-BRACES-6838727:
66
- '*':
77
reason: devDependency
88
expires: 2025-12-01T12:00:00.000Z
99
created: 2024-10-23T12:00:00.000Z
10-
SNYK-RHEL9-EXPAT-12672450:
10+
SNYK-RHEL9-EXPAT-12672450:
1111
- '*':
12-
reason: >-
13-
There is no fix at this time
12+
reason: There is no fix at this time
1413
expires: 2026-10-31T12:00:00.000Z
1514
created: 2025-09-15T12:00:00.000Z
16-
SNYK-JS-TOUGHCOOKIE-5672873:
15+
SNYK-JS-TOUGHCOOKIE-5672873:
1716
- '*':
1817
reason: >-
1918
Waiting for @kubernetes/client-node fetch migration
2019
https://github.com/kubernetes-client/javascript/blob/master/FETCH_MIGRATION.md
2120
expires: 2025-01-10T12:00:00.000Z
2221
created: 2024-10-23T12:00:00.000Z
23-
SNYK-RHEL9-LIBXML2-13863026:
24-
- '*':
25-
reason: >-
26-
No fix available at this time
27-
expires: 2025-12-19T12:00:00.000Z
28-
created: 2025-11-19T12:00:00.000Z
29-
SNYK-PYTHON-SETUPTOOLS-7448482:
22+
SNYK-RHEL9-LIBXML2-13863026:
3023
- '*':
31-
reason: >-
32-
Introduced by Google Cloud SDK, waiting for upstream fix
33-
expires: 2025-12-19T12:00:00.000Z
34-
created: 2025-11-19T12:00:00.000Z
24+
reason: No upstream fix available
25+
expires: 2026-01-19T00:00:00.000Z
26+
created: 2025-11-19T08:49:30.715Z
3527
patch: {}

Dockerfile.ubi9

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
ARG UBI9_VERSION=9.7
2+
13
#---------------------------------------------------------------------
24
# STAGE 1: Build credential helpers inside a temporary container
35
#---------------------------------------------------------------------
4-
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/go-toolset:9.6 as cred-helpers-build
6+
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/go-toolset:${UBI9_VERSION} as cred-helpers-build
57

68
RUN GOTOOLCHAIN=go1.23.4 go install github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login@bef5bd9384b752e5c645659165746d5af23a098a
79
RUN --mount=type=secret,id=gh_token,uid=1001,required=true \
@@ -13,7 +15,7 @@ RUN --mount=type=secret,id=gh_token,uid=1001,required=true \
1315
#---------------------------------------------------------------------
1416
# STAGE 2: Build kubernetes-monitor application
1517
#---------------------------------------------------------------------
16-
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/nodejs-22:9.6 AS build
18+
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/nodejs-22:${UBI9_VERSION} AS build
1719

1820
ENV NODE_ENV production
1921

@@ -31,14 +33,14 @@ RUN npm run build
3133
#---------------------------------------------------------------------
3234
# STAGE 3: Install containers-common to obtain configuration files
3335
#---------------------------------------------------------------------
34-
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi:9.6 AS containers-common
36+
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi:${UBI9_VERSION} AS containers-common
3537

3638
RUN dnf install -y containers-common
3739

3840
#---------------------------------------------------------------------
3941
# STAGE 4: Build the kubernetes-monitor final image
4042
#---------------------------------------------------------------------
41-
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi:9.6
43+
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi:${UBI9_VERSION}
4244

4345
ARG NODE_MAJOR_VERSION=22
4446
ARG NODE_LATEST_VERSION

0 commit comments

Comments
 (0)