fix(build): honor provenance/sbom false in per-service bake attest - #14112
Open
glours wants to merge 1 commit into
Open
fix(build): honor provenance/sbom false in per-service bake attest#14112glours wants to merge 1 commit into
glours wants to merge 1 commit into
Conversation
When a service set `build.provenance: false` (or `sbom: false`), the bake attest entry was silently omitted (the field is `omitempty`), so BuildKit applied its defaults and attached a provenance attestation anyway. The attestation changes the manifest-list digest on every build, which caused containers to be needlessly recreated on `up --build`. Emit `"type=<t>,disabled=true"` instead, which BuildKit's `Attest.UnmarshalText` parses as `Disabled:true` and forwards to BuildKit as an explicit disable signal. Extract `appendAttest` to avoid duplicating the three-branch switch for both provenance and sbom. Fixes docker#14111 Signed-off-by: Guillaume Lours <glours@users.noreply.github.com>
docker-agent
left a comment
docker-agent
left a comment
Contributor
There was a problem hiding this comment.
Assessment: 🟢 APPROVE
The refactor is correct and complete. The new appendAttest helper cleanly handles all four value branches ("", "true", "false", and user-supplied strings), and the "type=<t>,disabled=true" format is the correct signal for BuildKit's Attest.UnmarshalText to set Disabled: true. No behavioral regressions from the extraction — both provenance and sbom code paths are now symmetric and the test suite covers the key cases including the previously-broken false branch.
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
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
2 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 I did
When a service set
build.provenance: false(orsbom: false), the bake attest entry was silently omitted (the field isomitempty), so BuildKit applied its defaults and attached a provenance attestation anyway. The attestation changes the manifest-list digest on every build, which caused containers to be needlessly recreated onup --build.Emit
"type=<t>,disabled=true"instead, which BuildKit'sAttest.UnmarshalTextparses asDisabled:trueand forwards to BuildKit as an explicit disable signal.Extract
appendAttestto avoid duplicating the three-branch switch for both provenance and sbom.Related issue
Fixes #14111
(not mandatory) A picture of a cute animal, if possible in relation to what you did