Fix handling of whitelisted directories in dockerignore #2589
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
corneliusweig
requested review from
balopat,
dgageot,
nkubala,
priyawadhwa and
tejal29
as code owners
Codecov Report
|
This code snippet closely follows the reference implementation from github.com/docker/docker/pkg/archive/archive.go Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
corneliusweig
force-pushed
the
w/whitelist-dockerignore
branch
from
27eecc5 to
86100a7
Compare
|
Thanks for tackling this @corneliusweig ! Did you get a chance to try the fix on the sample repo provided in the bug? |
|
@priyawadhwa Yes, it runs without error. I also added test-cases to cover these scenarios. |
corneliusweig
commented
Aug 2, 2019
| @@ -357,7 +357,7 @@ func TestGetDependencies(t *testing.T) { | |||
| description: "dockerignore with context in parent directory", | |||
| dockerfile: copyDirectory, | |||
| workspace: "docker/..", | |||
| ignore: "bar\ndocker/*\n*.go", | |||
| ignore: "bar\ndocker\n*.go", | |||
There was a problem hiding this comment.
This change means the same, but increases test coverage.
priyawadhwa
approved these changes
Aug 2, 2019
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.
This PR fixes handling of whitelisted directories in
.dockerignore.The code closely follows the reference implementation from
https://github.com/docker/cli/blame/f019bdcace678c71690a99f6c5f30303c33534bc/vendor/github.com/docker/docker/pkg/archive/archive.go#L832 Does that already mandate a proper attribution?
Fixes #2576