X Tutup
Skip to content

Fix .dockerignore handling on Windows#893

Merged
KostyaSha merged 1 commit intodocker-java:masterfrom
orzeh:dockerignore-on-windows
Aug 12, 2017
Merged

Fix .dockerignore handling on Windows#893
KostyaSha merged 1 commit intodocker-java:masterfrom
orzeh:dockerignore-on-windows

Conversation

@orzeh
Copy link
Copy Markdown
Contributor

@orzeh orzeh commented Aug 8, 2017

When excluding files from build context using patterns defined in .dockerignore file FilePathUtil.relativize() method is used. It changes path separator to / which leads to files not being properly excluded on Windows machines. This PR fixes that issue.

This PR is partially related to #890 and gradle-docker-java plugin issue as it is impossible to exclude subdirectories and/or files on Windows.


This change is Reviewable

@cdancy
Copy link
Copy Markdown
Contributor

cdancy commented Aug 9, 2017

@orzeh @KostyaSha should we spin off another PR/branch to get this merged into the next point release (3.0.13)?

@KostyaSha
Copy link
Copy Markdown
Member

Is it possible to cover with some test case?

@orzeh
Copy link
Copy Markdown
Contributor Author

orzeh commented Aug 9, 2017

@KostyaSha existing test fails on Windows without this fix.

@cdancy
Copy link
Copy Markdown
Contributor

cdancy commented Aug 9, 2017

@orzeh @KostyaSha one these days, hopefully in the not too distant future, we'll all look back and laugh that folks were ever using windows in the first place ;)

@KostyaSha
Copy link
Copy Markdown
Member

Could you place comment about windows in code?

@orzeh
Copy link
Copy Markdown
Contributor Author

orzeh commented Aug 9, 2017

@KostyaSha where? And what should I comment?

@KostyaSha
Copy link
Copy Markdown
Member

Under this line describing that this required for windows

@orzeh
Copy link
Copy Markdown
Contributor Author

orzeh commented Aug 12, 2017

@KostyaSha ok, I added comment.

@KostyaSha KostyaSha added this to the 3.1.0 milestone Aug 12, 2017
@KostyaSha
Copy link
Copy Markdown
Member

and to 3.0.x if needed faster

@KostyaSha KostyaSha merged commit ff99b1e into docker-java:master Aug 12, 2017
@orzeh orzeh deleted the dockerignore-on-windows branch August 13, 2017 20:33
panuse pushed a commit to TuKangTech/docker-java that referenced this pull request Aug 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

X Tutup