Skip to content

Fix for #643 - #648

Merged
KostyaSha merged 2 commits into
docker-java:masterfrom
tejksat:fixDockerignoreRulesProcessing
Aug 1, 2016
Merged

KostyaSha merged 2 commits into
docker-java:masterfrom
tejksat:fixDockerignoreRulesProcessing

Conversation

@tejksat

@tejksat tejksat commented Jul 29, 2016

Copy link
Copy Markdown
Contributor

Fix for #643
.dockerignore rules handling refactored. A rule is translated to a regexp pattern and then a path is checked against it.


This change is Reviewable

.dockerignore rules handling refactored. A rule is translated to a regexp pattern and then a path is checked against it.
@KostyaSha

Copy link
Copy Markdown
Member

Looks crazy :)

@tejksat

tejksat commented Jul 29, 2016

Copy link
Copy Markdown
Contributor Author

@KostyaSha what exactly?)

@KostyaSha

Copy link
Copy Markdown
Member

Too much changes, will try read again bit later.

@tejksat

tejksat commented Jul 30, 2016

Copy link
Copy Markdown
Contributor Author

@KostyaSha yeah, true. It's better to read match() method as a new one. It've been changed heavy.

Failing tests on Windows fixed: Windows file separator escaped.
@KostyaSha

Copy link
Copy Markdown
Member

If something will fail, then it pure tests issue. Thanks for contribution!

@KostyaSha
KostyaSha merged commit b1ed66b into docker-java:master Aug 1, 2016
@KostyaSha

Copy link
Copy Markdown
Member

Btw, would suggest look into docker-cli code and pick their algos :)

@KostyaSha KostyaSha added this to the 3.0.1 milestone Aug 1, 2016
@KostyaSha

Copy link
Copy Markdown
Member

Checkstyle failed GoLangFileMatch length...

@tejksat

tejksat commented Aug 2, 2016

Copy link
Copy Markdown
Contributor Author

@KostyaSha I will refactor and PR soon.

@tejksat

tejksat commented Aug 2, 2016

Copy link
Copy Markdown
Contributor Author

Thanks for the good suggestion! I've almost guessed it right (https://github.com/docker/docker/blob/40044cb18fd4ff0ed13d8cdd41ec4dcecdac0703/pkg/fileutils/fileutils.go#L132) :)

@KostyaSha

Copy link
Copy Markdown
Member

And you can pick their test cases ;)

panuse pushed a commit to TuKangTech/docker-java that referenced this pull request Aug 20, 2017
* Fix for docker-java#643

.dockerignore rules handling refactored. A rule is translated to a regexp pattern and then a path is checked against it.

* Fix for docker-java#643

Failing tests on Windows fixed: Windows file separator escaped.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants