bake: fix definitions merge order#2237
Merged
crazy-max merged 1 commit intodocker:masterfrom Feb 2, 2024
Merged
Conversation
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
jedevc
approved these changes
Feb 2, 2024
Collaborator
jedevc
left a comment
jedevc
left a comment
There was a problem hiding this comment.
Nice and easy-to-understand fix! LGTM 🎉
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.
fixes #2236
This is a regression introduced in Buildx 0.12.0 (#1838) that makes order when reading bake definitions inconsistent. Changes are minimal to encourage backporting to v0.12 branch but will open a follow-up to review this logic as we should also consider merge order when importing unattended files from remote or archive. This would be an enhancement so I keep this out for now.