*: various whiteout improvements #258
Merged
Conversation
This file contains 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
cyphar
force-pushed
the
whiteout
branch
3 times, most recently
from
ff0457f to
9315801
Compare
This change ultimately makes our images a little bit smaller by no longer whiting-out every sub-entry when a directory has been deleted. While this is a net benefit, the cause of this change is a Docker breakage (which arguably added a restriction that is contrary to the OCI specification and thus it is definitely *their* bug). But to play nice (and to take the opportunity to improve some images) we can fix it in umoci. Signed-off-by: Aleksa Sarai <[email protected]>
Previously umoci-insert(1) was quite limited in that it would only insert a given file or directory without having any configurability. Something users might want is the ability to delete a path without an unpack-repack cycle. Or they want to replace the contents of a directory rather than merge them. To this effect, add --whiteout and --opaque which provide the corresponding features. --whiteout just adds a whiteout at the target path, while --opaque adds an opaque whiteout for the target before doing the copy. You _can_ use --whiteout and --opaque together but it's basically useless, and Docker might complain for no good reason. Signed-off-by: Aleksa Sarai <[email protected]>
|
LGTM. I've tested #254 and it no longer happens with these patches. |
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.
Previously umoci-insert(1) was quite limited in that it would only
insert a given file or directory without having any configurability.
Something users might want is the ability to delete a path without an
unpack-repack cycle. Or they want to replace the contents of a directory
rather than merge them.
To this effect, add --whiteout and --opaque which provide the
corresponding features. --whiteout just adds a whiteout at the target
path, while --opaque adds an opaque whiteout for the target before doing
the copy.
In addition, add support for "simplified whiteouts". This change ultimately
makes our images a little bit smaller by no longer whiting-out every sub-entry
when a directory has been deleted. While this is a net benefit, the cause of
this change is a Docker breakage (which arguably added a restriction that is
contrary to the OCI specification and thus it is definitely their bug). But
to play nice (and to take the opportunity to improve some images) we can fix it
in umoci.
Fixes #257
Fixes #254
Signed-off-by: Aleksa Sarai [email protected]