diffapply: do chown before xattrs#3671
Merged
sipsma merged 2 commits intomoby:masterfrom Feb 24, 2023
Merged
Conversation
Signed-off-by: Erik Sipsma <erik@sipsma.dev>
Chown will result file capabilities getting reset, so it should be done before setting xattrs to ensure they are retained. Signed-off-by: Erik Sipsma <erik@sipsma.dev>
tonistiigi
approved these changes
Feb 24, 2023
Member
|
Does this fix the issue reported in moby 23.0? or are changes needed on the moby side for that? (does this one need cherry-pick?) |
Collaborator
Author
|
@thaJeztah The moby issue was a combination of two orthogonal problems:
The PR here fixes I think |
Merged
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
4 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.
Chown will result file capabilities getting reset, so it should be done
before setting xattrs to ensure they are retained.
Signed-off-by: Erik Sipsma erik@sipsma.dev
The included test failed before only on the snapshotter w/ disable hardlinking. Passes after the new fix.