Make sure COPY/ADD on dirs doesn't grab too many files #8186
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
| @@ -293,9 +293,10 @@ func calcCopyInfo(b *Builder, cmdName string, ci *copyInfo, allowRemote bool, al | |||
| return err | |||
| } else if fi.IsDir() { | |||
| var subfiles []string | |||
| absOrigPath := path.Join(b.contextPath, ci.origPath) | |||
| absOrigPath += "/" | |||
There was a problem hiding this comment.
Shouldn't you check that there is no "/" already?
There was a problem hiding this comment.
Added a check for that - thanks
duglin
force-pushed
the
ErrInCopyCache
branch
2 times, most recently
from
2bc3e58
to
31c3beb
Compare
|
LGTM |
| dockerfile := ` | ||
| FROM scratch | ||
| MAINTAINER dockerio | ||
| ADD dir /tmp/` |
There was a problem hiding this comment.
Please use the preferred COPY.
No need for MAINTAINER.
There was a problem hiding this comment.
@tiborvass ok, done!
duglin
force-pushed
the
ErrInCopyCache
branch
from
31c3beb
to
2900705
Compare
Add check for / first - per LK4D4's comment. Add a comment to explain why we're adding a / Signed-off-by: Doug Davis <dug@us.ibm.com>
duglin
force-pushed
the
ErrInCopyCache
branch
from
2900705
to
cd329d0
Compare
|
Despite the drone error, all of the tests do run for me |
|
LGTM |
1 similar comment
|
LGTM |
vieux
added a commit
that referenced
this pull request
Sep 23, 2014
Make sure COPY/ADD on dirs doesn't grab too many files
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.
While working on #6820 I noticed that the algorithm used to calculate the hash/cache had this line in builder/internals.go - around line 628:
which means that if you're asking for a dir called "foo" to be copied, it would also treat a sibling file named "foo_bar" to also be included in the hash calculation. To fix this I simply added a "/" to the end of the absOrigPath.
To verify this I'm also including a testcase to ensure that adding a new sibling file with a similar name as a the dir doesn't invalidate the cache from a previous build.
I also moved the path.Join() out of the for-loop since its a static value that doesn't change during the loop.
To be honest, I would love to revamp a lot of this code. I'm very uncomfortable with the idea that we calculate the list of things to copy twice, once for the hash calculation and once during the copy/tar process. This leaves it very open to the two processes being different and inconsistent. I would prefer to just calc the total list of files once and use that list during both times but I'll leave that for another PR. However, I wouldn't mind some feedback on this idea because perhaps I'm missing something.
Signed-off-by: Doug Davis dug@us.ibm.com