ci: bump buildkit to v0.31.0#1097
Draft
cpuguy83 wants to merge 1 commit into
Draft
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR temporarily pins the CI environment to BuildKit v0.31.0-rc2 for validation. It introduces a workflow-level BUILDKIT_TEST_IMAGE env var as the single source of truth for the buildkit image, creates explicit docker buildx container builders in both the integration and e2e jobs (instead of relying on the engine's embedded buildkit), and bumps the github.com/moby/buildkit Go module from v0.30.0 to v0.31.0-rc2 along with all transitive dependency updates.
Changes:
- Add
BUILDKIT_TEST_IMAGEenv var and create pinned container builders in both the integration and e2e CI jobs so all test suites exercise the RC buildkitd. - Improve failure-mode log collection in the integration job to capture both dockerd and buildx container builder logs.
- Bump
github.com/moby/buildkitto v0.31.0-rc2 ingo.mod/go.sumwith transitive dependency updates fromgo mod tidy.
Reviewed changes
Copilot reviewed 2 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
.github/workflows/ci.yml |
Adds workflow-level BUILDKIT_TEST_IMAGE env, creates pinned buildx builders in integration and e2e jobs, improves log dump to capture buildx container logs |
go.mod |
Bumps buildkit to v0.31.0-rc2, Go version to 1.25.9, removes deprecated golang/protobuf indirect dep, updates transitive dependencies |
go.sum |
Corresponding checksum updates for all bumped transitive dependencies |
This was referenced Jun 16, 2026
Pin the CI builders to moby/buildkit:v0.31.0 and bump the buildkit Go module to match so both the integration (distro) matrix and the e2e suite build against the released buildkitd. Behavior changes: - Add a top-level BUILDKIT_TEST_IMAGE env as the single source of truth for the buildkit image under test. - The integration job now creates a buildx container builder pinned to the test image and uses it, instead of relying on the engine's embedded buildkit. The test harness (buildx dial-stdio) and the bake pre-builds all target this builder. Its failure log dump now also collects the buildx_buildkit_* container logs. - The e2e job creates a pinned container builder for both diff/merge matrix legs (USE_BUILDX=1 for both) rather than only the diff/merge-enabled leg falling back to the default docker driver for the other. - Bump github.com/moby/buildkit v0.30.0 -> v0.31.0 (with the transitive updates pulled in by go mod tidy). Trade-offs: - The integration job previously used the default docker driver, so bake pre-builds landed in the docker image store. With a container builder they warm the builder cache instead; tests consume the frontend as a buildkit frontend-input and reuse the same builder, so this is functionally equivalent but is the main thing to watch on the first run. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
899a37f to
c06d407
Compare
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.
Pins the CI builders to
moby/buildkit:v0.31.0and bumps the buildkit Go module to match so both the integration (distro) matrix and the e2e suite build against the released buildkitd.Changes
BUILDKIT_TEST_IMAGEenv as the single source of truth for the buildkit image under test.--usea buildx container builder pinned to the test image instead of relying on the engine's embedded buildkit. The test harness (buildx dial-stdio) and thebake frontend/bake workerpre-builds all target this builder. The failure log dump now also collects thebuildx_buildkit_*container logs.USE_BUILDX=1for both), rather than only the diff/merge-enabled leg using a container builder and the other falling back to the default docker driver.github.com/moby/buildkitv0.30.0 -> v0.31.0 (with the transitive updates fromgo mod tidy).Trade-offs / notes
Local validation:
go build ./...,go run ./cmd/lint ./...,go generate ./...(no diff),go test --test.short ./...all pass.