when comparing builder config files, ensure only compare post-processed#4172
Merged
deitch merged 1 commit intolinuxkit:masterfrom Sep 14, 2025
Merged
when comparing builder config files, ensure only compare post-processed#4172deitch merged 1 commit intolinuxkit:masterfrom
deitch merged 1 commit intolinuxkit:masterfrom
Conversation
52d036e to
786e54c
Compare
Signed-off-by: Avi Deitcher <avi@deitcher.net>
786e54c to
c69cf42
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.
Fixes #4171
- What I did
When the user passes a custom buildkitd.toml config to the builder, and a builder already exists, it is supposed to check it against the existing one. If it matches, reuse it; if not, start a new one.
The problem was that it was always starting a new one, even if it matches. This fixes it and adds tests:
bytes.Buffer, so it always would fail to match, as the buffer already had data in itFor the pre-processing, the problem was the following. It would
The new process does the following:
This way, they match successfully
The test runs 3 builds:
After each build, it retrieves and saves the container ID for the builder container.
The first two should match, the last should be different.
- How I did it
Fixes in linuxkit binary, and a new test
- How to verify it
CI, which is why I added tests
- Description for the changelog
Fixed bugs and added tests for custom builder config toml