update go version for CVE-2026-25679 - #6779
Conversation
There was a problem hiding this comment.
Pull request overview
This PR aims to update the Go toolchain used by the repository’s tooling (tools module and tools image) to address CVE-2026-25679.
Changes:
- Bumps the Go version in
tools/go.modto 1.26.1. - Updates the tooling Docker base image tag to
golang:1.26.1-alpine.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| tools/go.mod | Raises the tools module’s minimum Go version to 1.26.1. |
| tools/Dockerfile | Switches the tools image base tag to Go 1.26.1 on Alpine (still digest-pinned). |
| @@ -1,4 +1,4 @@ | |||
| FROM golang:1.26-alpine@sha256:2389ebfa5b7f43eeafbd6be0c3700cc46690ef842ad962f6c5bd6be49ed82039 | |||
| FROM golang:1.26.1-alpine@sha256:2389ebfa5b7f43eeafbd6be0c3700cc46690ef842ad962f6c5bd6be49ed82039 | |||
There was a problem hiding this comment.
The FROM golang:1.26.1-alpine@sha256:... line keeps the exact same digest as the previous 1.26-alpine image. When a digest is pinned, Docker will pull the manifest referenced by the digest regardless of the tag, so this change may not actually upgrade the Go toolchain (and might not address the CVE). Update the digest to the one for golang:1.26.1-alpine, or drop the digest (less preferred) if you intend to track the tag.
| FROM golang:1.26.1-alpine@sha256:2389ebfa5b7f43eeafbd6be0c3700cc46690ef842ad962f6c5bd6be49ed82039 | |
| FROM golang:1.26.1-alpine |
| module github.com/grafana/tempo/tools | ||
|
|
||
| go 1.26.0 | ||
| go 1.26.1 |
There was a problem hiding this comment.
go 1.26.1 in tools/go.mod raises the module's minimum required Go version to 1.26.1, which is a compatibility change (and is now stricter than the repo root go 1.26.0). If the goal is to keep the language version at Go 1.26 but ensure the patched toolchain is used for the CVE, consider keeping go 1.26.0 (or go 1.26) and adding a toolchain go1.26.1 directive instead; otherwise, align the root go.mod as well so the repo doesn't have mixed minimum versions.
| go 1.26.1 | |
| go 1.26.0 | |
| toolchain go1.26.1 |
|
The backport to To backport manually, run these commands in your terminal: git fetch
git switch --create backport-6779-to-release-v2.10 origin/release-v2.10
git cherry-pick -x fa67dd687e0cf587997ec84fdacae2d07e76e74aResolve the conflicts, then add the changes and run git add . && git cherry-pick --continueIf you have the GitHub CLI installed: git push --set-upstream origin backport-6779-to-release-v2.10
PR_BODY=$(gh pr view 6779 --json body --template 'Backport fa67dd687e0cf587997ec84fdacae2d07e76e74a from #6779{{ "\n\n---\n\n" }}{{ index . "body" }}')
echo "${PR_BODY}" | gh pr create --title '[release-v2.10] update go version for CVE-2026-25679' --body-file - --label 'backport' --label '' --base release-v2.10 --webOr, if you don't have the GitHub CLI installed (we recommend you install it!): git push --set-upstream origin backport-6779-to-release-v2.10And open a pull request where the |
|
The backport to To backport manually, run these commands in your terminal: git fetch
git switch --create backport-6779-to-release-v2.10 origin/release-v2.10
git cherry-pick -x fa67dd687e0cf587997ec84fdacae2d07e76e74aResolve the conflicts, then add the changes and run git add . && git cherry-pick --continueIf you have the GitHub CLI installed: git push --set-upstream origin backport-6779-to-release-v2.10
PR_BODY=$(gh pr view 6779 --json body --template 'Backport fa67dd687e0cf587997ec84fdacae2d07e76e74a from #6779{{ "\n\n---\n\n" }}{{ index . "body" }}')
echo "${PR_BODY}" | gh pr create --title '[release-v2.10] update go version for CVE-2026-25679' --body-file - --label 'backport' --label '' --base release-v2.10 --webOr, if you don't have the GitHub CLI installed (we recommend you install it!): git push --set-upstream origin backport-6779-to-release-v2.10And open a pull request where the |
1 similar comment
|
The backport to To backport manually, run these commands in your terminal: git fetch
git switch --create backport-6779-to-release-v2.10 origin/release-v2.10
git cherry-pick -x fa67dd687e0cf587997ec84fdacae2d07e76e74aResolve the conflicts, then add the changes and run git add . && git cherry-pick --continueIf you have the GitHub CLI installed: git push --set-upstream origin backport-6779-to-release-v2.10
PR_BODY=$(gh pr view 6779 --json body --template 'Backport fa67dd687e0cf587997ec84fdacae2d07e76e74a from #6779{{ "\n\n---\n\n" }}{{ index . "body" }}')
echo "${PR_BODY}" | gh pr create --title '[release-v2.10] update go version for CVE-2026-25679' --body-file - --label 'backport' --label '' --base release-v2.10 --webOr, if you don't have the GitHub CLI installed (we recommend you install it!): git push --set-upstream origin backport-6779-to-release-v2.10And open a pull request where the |
* update tools go version for CVE-2026-25679 * update go version globally
* update go version for CVE-2026-25679 (#6779) * update tools go version for CVE-2026-25679 * update go version globally * update ci go version
* update tools go version for CVE-2026-25679 * update go version globally
* update go version for CVE-2026-25679 (#6779) * update tools go version for CVE-2026-25679 * update go version globally * git oopsies * update ci go version * cherry-picked extra line that is not needed for this version
* update tools go version for CVE-2026-25679 * update go version globally
* update go version for CVE-2026-25679 (#6779) * update tools go version for CVE-2026-25679 * update go version globally * update workflow with correct version
* update tools go version for CVE-2026-25679 * update go version globally
What this PR does: update go version for CVE-2026-25679
Which issue(s) this PR fixes:
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]