Repository navigation
Conversation
Signed-off-by: Kyle Brennan <kyle@ona.com> Co-authored-by: Codex <noreply@openai.com>
Signed-off-by: Kyle Brennan <kyle@ona.com> Co-authored-by: Codex <noreply@openai.com>
3 of 15 tasks
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.
Description
Update
custom-mirror, the branch of the long-running Gitpod fork PR #1, so the next manually published Gitpod BuildKit image includes the critical vulnerability fixes.This branch starts at
custom-mirrorcommit93509e16aand targetscustom-mirror. The long-running PR remains open; this change does not merge the fork back tomaster.There are two commits:
v0.20.1-gitpod.8back ontocustom-mirror: patched gRPC/dependencies, the Git source subdirectory validation backport and its VEX statement, Alpine 3.23, and rebuilt helper binaries. Unrelated development-container additions are excluded.golang.org/x/netto 0.60.0, including the CNI/runc pins and required supporting dependencies. Align the build/test workflow and Dockerfile frontend toolchains. These address GO-2026-6604 (CVE-2026-56857) and GO-2026-6612 (CVE-2026-78663).Most changed files are the generated vendor tree:
custom-mirrorstill had Go 1.23 /x/net0.33.0 and older gRPC. The existing mirror patches and fork build process are preserved.Related changes and publication
Supersedes #3, which targeted the release branch.
Required by gitpod-io/gitpod#21636. After review, the maintainer will merge into
custom-mirrorand manually upload the new version to Gitpod Core Dev. The Gitpod consumer then needs a small image-reference update and a fresh production scan. No merge, tag, or image publication is performed by this PR.How to test
Completed locally on native Linux amd64 with Go 1.26.9:
GO_VERSION=1.26.9 docker buildx bake binaries --set binaries.platform=linux/amd64 --progress plainpasses.SKIP_INTEGRATION_TESTS=1 go test -timeout 10m ./cmd/buildctl/... ./session/... ./util/resolver/... ./source/git/... ./util/gitutil/...passes.go mod tidy -diffandgit diff --checkpass.dir:./bin/build.The scan covers rebuilt binaries, not a published image or the complete Gitpod production build. Full integration tests and a scan of the manually published image remain outstanding. Local unit tests use the repository's integration-test exclusion switch because the CLI integration tests require an external registry.