Write parent directories to tar before whiteout files #2113
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
Fixes GoogleContainerTools#1149 The OCI image spec does not specify this order but it's a good idea and Docker does the same. When manually comparing layers created by Docker and Kaniko there are still some differences (that container-diff does not show): * Kaniko adds / to layers * For `mkdir /test`, docker adds `/test` and an opaque whiteout file `/test/.wh..wh..opq`. Kaniko only adds `/test/` (and /).
Fix typos and use listFilesInTar() where possible
|
I am just wondering if I have accidentially killed a feature. I will have a look at it. |
gabyx
reviewed
May 31, 2022
| @@ -251,6 +246,19 @@ func writeToTar(t util.Tar, files, whiteouts []string) error { | |||
| return nil | |||
| } | |||
|
|
|||
| func addParentDirectories(t util.Tar, addedPaths map[string]bool, path string) error { | |||
imjasonh
approved these changes
May 31, 2022
gabyx
reviewed
May 31, 2022
| } | ||
|
|
||
| // Sorting does the right thing in this case. The expected order for a directory is: | ||
| // Parent dirs first, then whiteout files in the directory, then other files in that directory |
gabyx
reviewed
May 31, 2022
| @@ -599,3 +626,23 @@ func setUpTest(t *testing.T) (string, *Snapshotter, func(), error) { | |||
|
|
|||
| return testDir, snapshotter, cleanup, nil | |||
| } | |||
|
|
|||
| func listFilesInTar(path string) ([]string, error) { | |||
There was a problem hiding this comment.
Thanks for the kind compliments
|
@imjasonh Looks good to me! |
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 #1149
Description
This PR changes the order in which files and directories are written to tar layers such that parent directories of whiteout files are written before the whiteout files themselves.
The OCI image spec does not specify this order but it's a good idea and Docker
does the same.
Submitter Checklist
These are the criteria that every PR should meet, please check them off as you
review them:
See the contribution guide for more details.
Reviewer Notes
Release Notes