Skip to content

Commit 887f773

Browse files
EItanyaclaude
andauthored
fix: resolve CVE-2025-15558 and improve image scan workflow (#1462)
## Summary - **CVE-2025-15558 fix**: Bump `go-containerregistry` from v0.20.7 to v0.21.2 in the skills-init Dockerfile, updating transitive `docker/cli` dependency from v29.0.3 to v29.2.1 - **fail-fast: false**: Image scan matrix now runs all jobs to completion so all CVEs are visible even if one image fails - **golang-adk**: Added to the image scan matrix ## Test plan - [ ] Verify image scan workflow runs all matrix jobs to completion - [ ] Verify skills-init image no longer reports CVE-2025-15558 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Signed-off-by: Eitan Yarmush <eitan.yarmush@solo.io> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 92a6d64 commit 887f773

File tree

5 files changed

+12
-40
lines changed

5 files changed

+12
-40
lines changed

.github/workflows/image-scan.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ env:
2323
jobs:
2424
build:
2525
strategy:
26+
fail-fast: false
2627
matrix:
2728
image:
2829
- controller
2930
- ui
3031
- app
3132
- skills-init
33+
- golang-adk
3234
runs-on: ubuntu-latest
3335
services:
3436
registry:
@@ -70,7 +72,7 @@ jobs:
7072
id: image-versions
7173
run: make build-img-versions
7274
- name: Image vulnerability scanner
73-
uses: aquasecurity/trivy-action@0.33.1
75+
uses: aquasecurity/trivy-action@0.35.0
7476
with:
7577
image-ref: localhost:5001/kagent-dev/kagent/${{ matrix.image }}:${{ steps.vars.outputs.version }}
7678
severity: 'CRITICAL,HIGH'

docker/skills-init/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### Stage 0: build krane
22
FROM golang:1.25-alpine AS krane-builder
33

4-
ENV KRANE_VERSION=v0.20.7
4+
ENV KRANE_VERSION=v0.21.2
55
WORKDIR /build
66

77
RUN apk add --no-cache git && \

python/Dockerfile

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,3 @@
1-
# Temporary: use apk to install krane
2-
# once https://github.com/wolfi-dev/os/pull/78579 is merged.
3-
### STAGE 0: build krane
4-
ARG BASE_IMAGE_REGISTRY=cgr.dev
5-
FROM $BASE_IMAGE_REGISTRY/chainguard/go:latest AS krane-builder
6-
7-
ENV KRANE_VERSION=v0.20.7
8-
WORKDIR /build
9-
10-
RUN git clone --depth 1 --branch $KRANE_VERSION \
11-
https://github.com/google/go-containerregistry.git
12-
13-
WORKDIR /build/go-containerregistry/cmd/krane
14-
15-
RUN --mount=type=cache,target=/root/.cache/go-build \
16-
--mount=type=cache,target=/go/pkg/mod \
17-
CGO_ENABLED=0 go build \
18-
-trimpath \
19-
-ldflags="-s -w" \
20-
-o /build/krane .
21-
221
### STAGE 1: base image
232
ARG BASE_IMAGE_REGISTRY=cgr.dev
243
FROM $BASE_IMAGE_REGISTRY/chainguard/wolfi-base:latest AS base-os
@@ -103,11 +82,6 @@ RUN --mount=type=cache,target=/root/.npm \
10382
# Ensure the sandbox runtime binaries are on PATH
10483
ENV PATH="/opt/sandbox-runtime/node_modules/.bin:$PATH"
10584

106-
# Install anthropic sandbox runtime and dependencies
107-
#RUN --mount=type=cache,target=/var/cache/apk,rw \
108-
# apk add krane
109-
COPY --from=krane-builder --chown=1001:1001 /build/krane /usr/local/bin/krane
110-
11185
USER python
11286
WORKDIR /.kagent
11387

python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dev = [
66
"pytest>=8.3.5",
77
"pytest-asyncio>=0.25.3",
88
"ruff>=0.11.5",
9-
"authlib>=1.6.4"
9+
"authlib>=1.6.7"
1010
]
1111

1212
[tool.uv]

python/uv.lock

Lines changed: 7 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)