Skip to content

Commit d08de8a

Browse files
fix(security): clear Trivy HIGH findings after crane add
Upgrade setuptools/msgpack from get-pip, bump Go CLIs with newer releases, and ignore CVE-2026-56852 (x/text) until base containerd and dive rebuild against 0.39.0. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 2bba54c commit d08de8a

3 files changed

Lines changed: 30 additions & 18 deletions

File tree

.trivyignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ CVE-2025-66626 exp:2026-08-19
7070
CVE-2025-68156 exp:2026-08-19
7171
CVE-2026-23960 exp:2026-08-19
7272
CVE-2026-27112 exp:2026-08-19
73+
# golang.org/x/text infinite-loop (norm.Iter). Fixed in x/text 0.39.0; still
74+
# vendored <0.39 by base containerd/ctr and several pinned Go CLIs (dive has no
75+
# newer release). Drop as upstream rebuilds land.
76+
CVE-2026-56852 exp:2026-09-19
7377
#
7478
# Remaining Go-related CVEs from current Trivy report (base/runtime binaries).
7579
# These are tracked temporarily until upstream runner/base/toolchain refreshes.

Containerfile

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,15 @@ RUN apt-get update \
2828
# deadsnakes PPA does not ship python3.x-pip; bootstrap via get-pip.py.
2929
# PEP 668 marks the environment as externally managed; --break-system-packages is
3030
# acceptable in a container image where we own the environment.
31-
# hadolint ignore=DL4006
31+
# hadolint ignore=DL4006,DL3013
3232
RUN curl -sSL https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py \
3333
&& python3.12 /tmp/get-pip.py --no-cache-dir --break-system-packages \
3434
&& python3.13 /tmp/get-pip.py --no-cache-dir --break-system-packages \
35-
&& rm /tmp/get-pip.py
35+
&& rm /tmp/get-pip.py \
36+
&& python3.12 -m pip install --no-cache-dir --break-system-packages --upgrade \
37+
"setuptools>=78.1.1" "msgpack>=1.2.1" \
38+
&& python3.13 -m pip install --no-cache-dir --break-system-packages --upgrade \
39+
"setuptools>=78.1.1" "msgpack>=1.2.1"
3640

3741
# Configure buildah storage for container/rootless usage
3842
RUN mkdir -p /etc/containers \
@@ -50,7 +54,7 @@ RUN curl -fsSL https://aquasecurity.github.io/trivy-repo/deb/public.key \
5054
&& rm -rf /var/lib/apt/lists/*
5155

5256
# Install syft (SBOM generator)
53-
ARG SYFT_VERSION=1.46.0
57+
ARG SYFT_VERSION=1.50.0
5458
RUN curl -sSL -o /tmp/syft.tgz \
5559
"https://github.com/anchore/syft/releases/download/v${SYFT_VERSION}/syft_${SYFT_VERSION}_linux_amd64.tar.gz" \
5660
&& tar -xzf /tmp/syft.tgz -C /tmp syft \
@@ -59,7 +63,7 @@ RUN curl -sSL -o /tmp/syft.tgz \
5963
&& rm -f /tmp/syft.tgz
6064

6165
# Install grype (vulnerability scanner)
62-
ARG GRYPE_VERSION=0.115.0
66+
ARG GRYPE_VERSION=0.116.1
6367
RUN curl -sSL -o /tmp/grype.tgz \
6468
"https://github.com/anchore/grype/releases/download/v${GRYPE_VERSION}/grype_${GRYPE_VERSION}_linux_amd64.tar.gz" \
6569
&& tar -xzf /tmp/grype.tgz -C /tmp grype \
@@ -91,27 +95,27 @@ RUN curl -sSL -o /usr/local/bin/yq \
9195
&& chmod +x /usr/local/bin/yq
9296

9397
# Install Argo Workflows CLI
94-
ARG ARGO_VERSION=4.0.7
98+
ARG ARGO_VERSION=4.0.8
9599
RUN curl -sSL -o /tmp/argo-linux-amd64.gz \
96100
"https://github.com/argoproj/argo-workflows/releases/download/v${ARGO_VERSION}/argo-linux-amd64.gz" \
97101
&& gunzip /tmp/argo-linux-amd64.gz \
98102
&& mv /tmp/argo-linux-amd64 /usr/local/bin/argo \
99103
&& chmod +x /usr/local/bin/argo
100104

101105
# Install Kargo CLI
102-
ARG KARGO_VERSION=1.10.8
106+
ARG KARGO_VERSION=1.11.0
103107
RUN curl -sSL -o /usr/local/bin/kargo \
104108
"https://github.com/akuity/kargo/releases/download/v${KARGO_VERSION}/kargo-linux-amd64" \
105109
&& chmod +x /usr/local/bin/kargo
106110

107111
# Install kubectl (in-cluster kpack Build CRs from green ARC runners)
108-
ARG KUBECTL_VERSION=1.36.2
112+
ARG KUBECTL_VERSION=1.36.3
109113
RUN curl -sSL -o /usr/local/bin/kubectl \
110114
"https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \
111115
&& chmod +x /usr/local/bin/kubectl
112116

113117
# Install GitHub CLI (workflows calling `gh api`, e.g. dependency-graph snapshots)
114-
ARG GH_CLI_VERSION=2.96.0
118+
ARG GH_CLI_VERSION=2.97.0
115119
RUN curl -sSL -o /tmp/gh.tgz \
116120
"https://github.com/cli/cli/releases/download/v${GH_CLI_VERSION}/gh_${GH_CLI_VERSION}_linux_amd64.tar.gz" \
117121
&& tar -xzf /tmp/gh.tgz -C /tmp "gh_${GH_CLI_VERSION}_linux_amd64/bin/gh" \
@@ -175,7 +179,7 @@ RUN npm install --prefix /tmp/openapi-tools --omit=dev --no-package-lock \
175179
&& rm -rf /root/.npm
176180

177181
# Install oasdiff (OpenAPI diff and breaking-change detection)
178-
ARG OASDIFF_VERSION=1.26.0
182+
ARG OASDIFF_VERSION=1.27.0
179183
RUN curl -sSL -o /tmp/oasdiff.tgz \
180184
"https://github.com/Tufin/oasdiff/releases/download/v${OASDIFF_VERSION}/oasdiff_${OASDIFF_VERSION}_linux_amd64.tar.gz" \
181185
&& tar -xzf /tmp/oasdiff.tgz -C /tmp oasdiff \
@@ -214,9 +218,13 @@ RUN curl -sSL -o /tmp/cargo-lambda.tgz \
214218
&& rm -f /tmp/cargo-lambda.tgz \
215219
&& cargo lambda --version
216220

217-
# Install pre-commit
221+
# Install pre-commit; re-pin setuptools/msgpack after its deps settle.
218222
# hadolint ignore=DL3013
219-
RUN pip3 install --no-cache-dir pre-commit
223+
RUN pip3 install --no-cache-dir --break-system-packages pre-commit \
224+
&& python3.12 -m pip install --no-cache-dir --break-system-packages --upgrade \
225+
"setuptools>=78.1.1" "msgpack>=1.2.1" \
226+
&& python3.13 -m pip install --no-cache-dir --break-system-packages --upgrade \
227+
"setuptools>=78.1.1" "msgpack>=1.2.1"
220228

221229
# Base stage must not end as root (hadolint DL3002)
222230
USER runner

manifest.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ build:
66
format: oci
77
args:
88
- RUNNER_VERSION=2.336.0
9-
- ARGO_VERSION=4.0.7
10-
- KARGO_VERSION=1.10.8
9+
- ARGO_VERSION=4.0.8
10+
- KARGO_VERSION=1.11.0
1111
- PACK_VERSION=0.40.8
1212
- CRANE_VERSION=0.21.8
13-
- KUBECTL_VERSION=1.36.2
14-
- GH_CLI_VERSION=2.96.0
13+
- KUBECTL_VERSION=1.36.3
14+
- GH_CLI_VERSION=2.97.0
1515
- DIVE_VERSION=0.13.1
16-
- SYFT_VERSION=1.46.0
17-
- GRYPE_VERSION=0.115.0
16+
- SYFT_VERSION=1.50.0
17+
- GRYPE_VERSION=0.116.1
1818
- HADOLINT_VERSION=2.14.0
1919
- YQ_VERSION=4.53.3
2020
- NODE_VERSION=24.18.0
@@ -23,7 +23,7 @@ build:
2323
- SPECTRAL_CLI_VERSION=6.16.1
2424
- PORTMAN_VERSION=1.35.0
2525
- NEWMAN_VERSION=6.2.2
26-
- OASDIFF_VERSION=1.26.0
26+
- OASDIFF_VERSION=1.27.0
2727
- RUST_VERSION=1.97.1
2828
- ZIG_VERSION=0.14.0
2929
- CARGO_LAMBDA_VERSION=1.9.1

0 commit comments

Comments
 (0)