X Tutup
Skip to content

Include empty directories in build context#889

Merged
KostyaSha merged 1 commit intodocker-java:masterfrom
orzeh:empty-dirs-in-build-context
Aug 8, 2017
Merged

Include empty directories in build context#889
KostyaSha merged 1 commit intodocker-java:masterfrom
orzeh:empty-dirs-in-build-context

Conversation

@orzeh
Copy link
Copy Markdown
Contributor

@orzeh orzeh commented Aug 6, 2017

Listing files in build context utilized Commons IO helper method FileUtils.listFiles() which does not return empty directories. This PR implements custom method which lists files in build context also handling empty dirs.


This change is Reviewable

pom.xml Outdated
<phase>process-test-resources</phase>
<configuration>
<tasks>
<!-- empty directory needed in DockerfileAddMultipleFilesTest not versioned in Git -->
Copy link
Copy Markdown
Member

@KostyaSha KostyaSha Aug 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just create directory in test new File("target/emptydir") it relative during maven test execution. TODO i plan migrate to junit and replace with @Rule

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KostyaSha I changed that and directory is now created inside test.

@cdancy
Copy link
Copy Markdown
Contributor

cdancy commented Aug 7, 2017

@KostyaSha have a few of our gradle-docker-plugin users looking for this fix. Any chance we could get it in sooner rather than later?

@KostyaSha
Copy link
Copy Markdown
Member

for master no, but i can create 3.0.X branch if you can PR into two branches

@cdancy
Copy link
Copy Markdown
Contributor

cdancy commented Aug 7, 2017

@KostyaSha that works! @orzeh thoughts?

@orzeh
Copy link
Copy Markdown
Contributor Author

orzeh commented Aug 7, 2017

@cdancy @KostyaSha I can apply those changes to 3.0.x and make second PR.

@KostyaSha
Copy link
Copy Markdown
Member

3.0.x open for hotfixes

@KostyaSha KostyaSha merged commit a2f7776 into docker-java:master Aug 8, 2017
@KostyaSha KostyaSha modified the milestones: 3.1.0, 3.0.13 Aug 8, 2017
@cdancy
Copy link
Copy Markdown
Contributor

cdancy commented Aug 9, 2017

Awesome. Thanks again @orzeh and @KostyaSha !

@MortlMcCrisis
Copy link
Copy Markdown

Great Job. I need this Library as a part of a plugin which causes issues because of this bug. I am very happy that I can look forward to continue my work. Thanks you very much @orzeh and @KostyaSha !

@orzeh orzeh deleted the empty-dirs-in-build-context branch August 9, 2017 11:13
@MortlMcCrisis
Copy link
Copy Markdown

When/Can version 3.0.13 now be released?

@cdancy
Copy link
Copy Markdown
Contributor

cdancy commented Aug 18, 2017

@KostyaSha any chance for a new point release?

@KostyaSha
Copy link
Copy Markdown
Member

i think i lost some PR, but ok.

@KostyaSha
Copy link
Copy Markdown
Member

@cdancy done

@cdancy
Copy link
Copy Markdown
Contributor

cdancy commented Aug 18, 2017

@KostyaSha thanks again! @MortlMcCrisis I'll put this new version through our tests and if all goes Ok plan to release v3.1.0 tomorrow.

panuse pushed a commit to TuKangTech/docker-java that referenced this pull request Aug 20, 2017
…text

Include empty directories in build context
@MortlMcCrisis
Copy link
Copy Markdown

@cdancy This would be nice. I have a dirty workaround in my code right now, which I would like to get rid of.

@KostyaSha KostyaSha modified the milestones: 3.1.0, 3.0.13 Aug 21, 2017
@cdancy
Copy link
Copy Markdown
Contributor

cdancy commented Aug 21, 2017

@MortlMcCrisis got a bit busy at home this weekend. Just released now. Have a go and let me know if this solves your problem.

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.

4 participants

X Tutup