Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Subdirectory support #413

Merged
merged 8 commits into from Oct 15, 2018

Conversation

@dsludwig
Copy link
Contributor

dsludwig commented Sep 26, 2018

This adds support for creating a Docker image from a subdirectory of a Git repo, rather than just the root.

I wanted to store my Docker image definition and some other configuration in the same repo, without the configuration getting into my image. This seemed like the most straight-forward way to do that.

@yuvipanda

This comment has been minimized.

Copy link
Collaborator

yuvipanda commented Sep 26, 2018

Thanks for opening this, @dsludwig! Looks good to me. Can you add a test too?

@dsludwig

This comment has been minimized.

Copy link
Contributor Author

dsludwig commented Sep 26, 2018

Thanks @yuvipanda, I added a test for this. I couldn't get the pytest capture to pick up the log, but when I run with -s, it does show up.

@yuvipanda yuvipanda requested a review from minrk Sep 26, 2018
@@ -0,0 +1,30 @@
"""
Test if the explict hostname is supplied correctly to the container

This comment has been minimized.

Copy link
@betatim

betatim Sep 27, 2018

Member

This should be about sub directories :)

@betatim betatim referenced this pull request Oct 1, 2018
@betatim

This comment has been minimized.

Copy link
Member

betatim commented Oct 8, 2018

@dsludwig is there something missing from this PR or can we go ahead and merge it?

@dsludwig

This comment has been minimized.

Copy link
Contributor Author

dsludwig commented Oct 15, 2018

@betatim I addressed your comments and resolved the merge conflicts, I think it's ready to go!

@betatim

This comment has been minimized.

Copy link
Member

betatim commented Oct 15, 2018

Sweet! Compare repo2docker --ref 78a3756458ee1c565f178b107cb7968c99a77a9d https://github.com/betatim/requirements and repo2docker --subdir some_dir --ref 78a3756458ee1c565f178b107cb7968c99a77a9d https://github.com/betatim/requirements. Rejoice!

Weird that codecov thinks that the sub directory parts aren't covered :-/

@betatim betatim merged commit 988ed3e into jupyter:master Oct 15, 2018
3 checks passed
3 checks passed
codecov/patch 44.44% of diff hit (target 0%)
Details
codecov/project 73.84% (target 0%)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.