Fix bug in extracting hardlinks in multistage builds #456
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
priyawadhwa
force-pushed
the
composer
branch
from
d9dfa61 to
98a9dad
Compare
When we execute multistage builds, we store the fs of each intermediate stage at /kaniko/<stage number> if it's used later in the build. This created a bug when extracting hardlinks, because we weren't appending the new directory to the link path. So, if `/tmp/file1` and `/tmp/file2` were hardlinked, kaniko was trying to link `/kaniko/0/tmp/file1` to `/tmp/file2` instead of `/kaniko/0/tmp/file2`. This change will append the correct directory to the link, and fixes GoogleContainerTools#437 GoogleContainerTools#362 GoogleContainerTools#352 GoogleContainerTools#342.
priyawadhwa
force-pushed
the
composer
branch
from
98a9dad to
9d67953
Compare
aduong
reviewed
Nov 18, 2018
pkg/util/fs_util.go
Outdated
|
|
||
| if err := os.Link(filepath.Clean(filepath.Join("/", hdr.Linkname)), path); err != nil { | ||
| link := filepath.Join(dest, hdr.Linkname) | ||
| if err := os.Link(filepath.Clean(filepath.Join("/", link)), path); err != nil { |
There was a problem hiding this comment.
I'm curious to know why "/". path is essentially filepath.Join(dest, hdr.Name), so it seems reasonable that the first arg to os.Link is filepath.Join(dest, hdr.Linkname), no?
There was a problem hiding this comment.
thanks for pointing that out! i've removed the unnecessary filepath.Join
added 3 commits
November 19, 2018 15:03
Now that hardlink destinations take into account the directory that they are being extracted to, the unit test had to be updated to make sure that two hardlinks were extracted to /tmp/hardlink correctly.
sharifelgamal
approved these changes
Nov 19, 2018
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.
When we execute multistage builds, we store the fs of each intermediate
stage at /kaniko/ if it's used later in the build. This
created a bug when extracting hardlinks, because we weren't appending
the new directory to the link path.
So, if
/tmp/file1and/tmp/file2were hardlinked, kaniko was tryingto link
/kaniko/0/tmp/file1to/tmp/file2instead of/kaniko/0/tmp/file2. This change will append the correct directory tothe link, and
fixes #437
fixes #362
fixes #352
fixes #342.