chore: backport busybox removal (#5717, #5754) to release-v2.9 [CVE-2025-60876] - #7410
Merged
zhxiaogg merged 2 commits intoJun 5, 2026
Merged
Conversation
zhxiaogg
force-pushed
the
backport-5717-to-release-v2.9
branch
from
June 5, 2026 15:33
2040fe5 to
9179722
Compare
zhxiaogg
marked this pull request as ready for review
June 5, 2026 15:50
zhxiaogg
requested review from
carles-grafana,
electron0zero,
ie-pham,
javiermolinar,
joe-elliott,
mapno,
mattdurham,
mdisibio,
ruslan-mikhailov,
stoewer,
yvrhdn and
zalegrala
as code owners
June 5, 2026 15:50
zhxiaogg
enabled auto-merge (squash)
June 5, 2026 15:51
electron0zero
approved these changes
Jun 5, 2026
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
3 participants
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.
What this PR does:
Backports #5717 and #5754 to
release-v2.9to remove busybox from the Tempo image, fixing CVE-2025-60876 (BusyBoxwgetrequest-line/header injection) reported againstgrafana/tempo:2.9.2.:debugis now used only in a throwawaytempo-setupbuilder stage; the final image ships from plaingcr.io/distroless/static-debian12with no busybox. Example docker-composeinithelpers switch tobusybox:latest; Tempo images stay pinned to2.9.2.The fix landed on
main/release-v2.10/release-v3.0after the 2.9 branch was cut, so it was never backported.Which issue(s) this PR fixes:
Backport of #5717, #5754
Checklist
.chloggen/