Defensively include Dockerfile #2270
Merged
+6
−2
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
devinrsmith
reviewed
Apr 14, 2022
| @@ -249,9 +249,13 @@ class Docker { | |||
| sync.into dockerWorkspaceContents | |||
|
|
|||
| if (cfg.dockerfileFile) { | |||
| sync.from cfg.dockerfileFile | |||
| sync.from(cfg.dockerfileFile) { CopySpec dockerfileCopy -> | |||
| dockerfileCopy.include('Dockerfile') | |||
There was a problem hiding this comment.
Should we take the provided file name instead of assuming Dockerfile?
There was a problem hiding this comment.
Yes, that's a good idea, I'll correct that.
niloc132
force-pushed
the
dockerfiles-always-included
branch
from
aff1c09 to
7aec7c1
Compare
devinrsmith
approved these changes
Apr 25, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is a problem as I make the "build this wheel in docker" more customizable, as it is possible to provide "includes" and "excludes" rules for the wheel that accidentally exclude the Dockerfile itself, thus making the project unbuildable. This commit ensures that the dockerfile itself will always be included when the image is prepared.
Partial #2221