Use path.Join to generate cache keys #3227
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
tonistiigi
reviewed
Oct 27, 2022
cache/contenthash/checksum.go
Outdated
| @@ -941,7 +941,7 @@ func (cc *cacheContext) checksum(ctx context.Context, root *iradix.Node, txn *ir | |||
| } | |||
|
|
|||
| // no FollowSymlinkInScope because invalid paths should not be inserted | |||
| fp := filepath.Join(target, filepath.FromSlash(p)) | |||
| fp := path.Join(target, filepath.FromSlash(p)) | |||
There was a problem hiding this comment.
Rest of the changes sgtm but this one I don't understand. This is the actual FS path for syscalls and filepath.FromSlash has already created a backslash path.
There was a problem hiding this comment.
You are correct. I got too eager with replacing filepath.Join(). Reverted this bit.
Using filepath.Join() breaks convertPathToKey() on Windows. Windows should be able to deal with both forward and backslashes. Using backslashes in paths here, will break the way we generate cache keys. convertPathToKey() currently replaces '/' with 0. Changing every code path to accomodate the Windows specific path separator is a lot more involved than allowing Windows to just handle the forward slash paths. Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
gabriel-samfira
force-pushed
the
fix-contenthash-on-windows
branch
from
0494ebd
to
b1d33dd
Compare
tonistiigi
approved these changes
Oct 27, 2022
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.
Using filepath.Join() breaks convertPathToKey() on Windows. Windows should be able to deal with both forward and backslashes. Using backslashes in paths here, will break the way we generate cache keys. convertPathToKey() currently replaces '/' with 0. Changing every code path to accomodate the Windows specific path separator is a lot more involved than allowing Windows to just handle the forward slash paths.
Signed-off-by: Gabriel Adrian Samfira gsamfira@cloudbasesolutions.com