Never exclude Dockerfile from the build context. #928
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
shin-
force-pushed
the
926-ignored_dockerfiles
branch
from
b0e6fc7 to
7a0eda3
Compare
| # will not descend into it and the file will be skipped. This ensures | ||
| # it doesn't happen. | ||
| set([dockerfile]) | ||
| if os.path.exists(os.path.join(root, dockerfile)) else {} |
There was a problem hiding this comment.
I doesn't seem like we do this os.path.exists() check in other places, is it necessary?
There was a problem hiding this comment.
and I believe the default should be set() not {}, right?
There was a problem hiding this comment.
If utils.tar() is called on a folder that doesn't contain a Dockerfile, it would break without this change. It doesn't affect docker-py directly I think (we have some tar unit tests that break), but it's part of our public API and some people seem to use it: #865
There was a problem hiding this comment.
Yeah, set(). Implicit type cast coming to the rescue obviously :)
Signed-off-by: Joffrey F <[email protected]>
shin-
force-pushed
the
926-ignored_dockerfiles
branch
from
7a0eda3 to
90760cf
Compare
|
LGTM |
shin-
added a commit
that referenced
this pull request
Feb 9, 2016
Never exclude Dockerfile from the build context.
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 #926