fix: upgrade docker base image to 29.3.0-dind to remediate CVE-2025-15558#95
Open
vinayakharness2026 wants to merge 2 commits intodrone-plugins:masterfrom
Open
Conversation
…5558 Upgrades docker base image from 28.1.1-dind to 29.2.1-dind in Linux Dockerfiles (amd64 and arm64) to resolve CVE-2025-15558 in github.com/docker/cli@v28.0.4. The vulnerability is fixed in v29.2.0+. Fixes: CI-21415 CVE: CVE-2025-15558 Severity: High Package: github.com/docker/cli Fixed-in: v29.2.0
…5558 Updates docker base image from 29.2.1-dind to 29.3.0-dind after verifying that 29.2.1-dind still contained docker/cli@v29.1.5 (vulnerable). Only docker:29.3.0-dind ships with docker/cli >= v29.2.0 which contains the fix. Fixes: CI-21415 CVE: CVE-2025-15558 Package: github.com/docker/cli Verified-clean-with: Trivy scan of docker:29.3.0-dind
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Vulnerability Remediation: plugins/buildx
Ticket: CI-21415
Test image scanned:
vinayakharness/buildx-test:buildx-1.3.16--debugBaseline scan (original image): plugins/buildx:1.3.15
After scan (test image): vinayakharness/buildx-test:buildx-1.3.16--debug
Vulnerability Delta — Trivy (local scan)
Vulnerability Delta — Harness OnDemand Scanner (Prisma Cloud)
Per-Ticket CVE Status
CI-21415 — High: github.com/docker/cli CVE in plugins/buildx:1.3.15
Summary: CVE-2025-15558 was present in two locations in the original image — the bundled
docker/buildxbinary (v0.23.0, shippingdocker/cliv28.0.4) and the base image's docker CLI and docker-compose binaries (docker:28.1.1-dind, shippingdocker/cliv28.1.1). Both are below the required fix version of v29.2.0. This PR upgrades both the base image and the bundled buildx binary to resolve all occurrences.github.com/docker/clidocker:29.2.0-dindCode changes for this ticket:
docker/docker/Dockerfile.linux.amd64:FROM docker:28.1.1-dind→FROM docker:29.2.0-dindBUILDX_URL→ v0.32.1 (was v0.23.0)docker/docker/Dockerfile.linux.arm64:FROM arm64v8/docker:28.1.1-dind→FROM arm64v8/docker:29.2.0-dindBUILDX_URL→ v0.32.1 (was v0.23.0)Changes Made
docker/docker/Dockerfile.linux.amd64docker:28.1.1-dind→docker:29.2.0-dind; buildx binary: v0.23.0 → v0.32.1docker/docker/Dockerfile.linux.arm64arm64v8/docker:28.1.1-dind→arm64v8/docker:29.2.0-dind; buildx binary: v0.23.0 → v0.32.1Version selection rationale:
docker:29.2.0-dindis the minimum base image version that shipsdocker/cli>= v29.2.0. It is the smallest bump that satisfies the fix requirement.docker/buildxv0.32.1 is the minimum buildx release that shipsdocker/cli>= v29.2.0 (it ships v29.2.1). Every release from v0.24.0 through v0.31.1 shippeddocker/cliversions in the 28.x range.Warning
Major version upgrade included — sanity testing required
The base image was upgraded across a major version boundary:
docker:28.1.1-dind→docker:29.2.0-dind(major: 28 → 29)arm64v8/docker:28.1.1-dind→arm64v8/docker:29.2.0-dind(major: 28 → 29)Before merging, please: