Skip to content

Commit 3075830

Browse files
authored
Merge branch 'main' into feat/pipeline-certfication-testing
2 parents ec40b25 + 78918cb commit 3075830

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
154154

155155
- name: Setup Node.js Environment
156-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
156+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
157157
with:
158158
node-version-file: .nvmrc
159159

@@ -224,7 +224,7 @@ jobs:
224224

225225
- name: Download Syft
226226
if: ${{ inputs.is_production_release }}
227-
uses: anchore/sbom-action/download-syft@f8bdd1d8ac5e901a77a92f111440fdb1b593736b # v0.20.6
227+
uses: anchore/sbom-action/download-syft@d8a2c0130026bf585de5c176ab8f7ce62d75bf04 # v0.20.7
228228

229229
- name: Install Cosign
230230
if: ${{ inputs.is_production_release }}

.github/workflows/lint.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6161

6262
- name: Setup Node.js Environment
63-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
63+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
6464
with:
6565
node-version-file: .nvmrc
6666

@@ -125,6 +125,8 @@ jobs:
125125
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
126126
with:
127127
version: 3.14.0 # renovate: datasource=github-tags depName=helm/chart-testing
128+
# v6.0.0 resolved the compatibility issue with Python > 3.13. may be removed after the action itself is updated
129+
yamale_version: "6.0.0"
128130

129131
- name: Run chart-testing
130132
run: ct lint --print-config --config .ct.yaml

build/ubi/Dockerfile.nginx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ADD --link --chown=101:1001 https://nginx.org/keys/nginx_signing.key nginx_signi
66
ADD --link --chown=101:1001 build/ubi/repos/nginx.repo nginx.repo
77
ADD --link --chown=101:1001 build/ubi/repos/agent.repo agent.repo
88

9-
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:46e38dc6d8a9151f28f6dd775c528425ca4dfbc2a39055da08f653c12f959d27 AS ubi9-packages
9+
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:001103e68586ef592de573bd3cbeb0ac84343a00d892f8d42f612e49f89b1e63 AS ubi9-packages
1010

1111
FROM redhat/ubi9-minimal:9.6 AS ubi-nginx
1212

build/ubi/Dockerfile.nginxplus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ADD --link --chown=101:1001 https://cs.nginx.com/static/files/plus-9.repo nginx-
66
ADD --link --chown=101:1001 https://nginx.org/keys/nginx_signing.key nginx_signing.key
77
ADD --link --chown=101:1001 build/ubi/repos/agent.repo agent.repo
88

9-
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:46e38dc6d8a9151f28f6dd775c528425ca4dfbc2a39055da08f653c12f959d27 AS ubi9-packages
9+
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:001103e68586ef592de573bd3cbeb0ac84343a00d892f8d42f612e49f89b1e63 AS ubi9-packages
1010

1111
FROM redhat/ubi9-minimal:9.6 AS ubi-nginx-plus
1212

0 commit comments

Comments
 (0)