Commit Graph

50 Commits

Author SHA1 Message Date
Justin Tyberg
c08b0735c9 Bump versions of JupyterHub dependencies 2016-12-05 21:55:21 -05:00
Justin Tyberg
d16571d65c Merge pull request #24 from parente/move-to-jhub-0.7
Upgrade example for JupyterHub 0.7
2016-12-05 20:52:18 -06:00
Peter Parente
492dc4e787 Merge pull request #28 from jtyberg/26-remove-make-up
Remove "make up" target.
2016-11-17 22:00:16 -05:00
Justin Tyberg
a07eeb44e3 Remove "make up" target.
Using "make up" does not honor shell environment variables, causes confusion.

(c) Copyright IBM Corp. 2016
2016-11-17 10:47:42 -05:00
Peter Parente
fe6fa41b33 Upgrade example for JupyterHub 0.7 2016-11-07 16:38:28 -08:00
Min RK
3c3b507caf Merge pull request #22 from jtyberg/make-20
Do not require SSL cert and key files if SECRETS_VOLUME is set.
2016-09-22 15:14:17 +02:00
Justin Tyberg
22774d3b72 Do not require SSL cert, key files in make targets if SECRETS_VOLUME is set.
(c) Copyright IBM Corp. 2016
2016-09-20 21:16:43 -04:00
Justin Tyberg
7bc6a02bcd Merge pull request #18 from moisei/install-docker-on-container
install docker on jupyterhub container
2016-09-20 21:14:18 -04:00
Justin Tyberg
59bae65012 Merge pull request #18 from moisei/install-docker-on-container
install docker on jupyterhub container
2016-08-18 08:26:59 -04:00
Moisei
dff2a90328 no need to mount docker binary from the host
If docker is installed in the JHub container, then there's no point in mounting the binary from the host.
2016-08-18 10:06:53 +03:00
moisei
93660a19ca install docker on jupyterhub container 2016-08-16 09:34:57 +03:00
Min RK
76aa995ae2 Merge pull request #17 from jtyberg/issue-16
Do not pass host config options in start_kwargs
2016-08-02 11:34:36 +02:00
Justin Tyberg
b5e5453d4f Bump minimum Docker version to 1.12 in README.
(c) Copyright IBM Corp. 2016
2016-08-01 17:04:25 -04:00
Justin Tyberg
4c896ffe64 Do not pass host config options as start keyword args.
* Docker 1.12+ does not support host config options at container start.

(c) Copyright IBM Corp. 2016
2016-08-01 16:58:01 -04:00
Justin Tyberg
575787f315 Bump to Dockerspawner 0.4.
(c) Copyright IBM Corp. 2016
2016-08-01 16:57:16 -04:00
Carol Willing
96501950e2 Merge pull request #14 from minrk/missing-notebook-dir
add missing DOCKER_NOTEBOOK_DIR
2016-05-13 06:19:24 -05:00
Min RK
b66699537e add missing DOCKER_NOTEBOOK_DIR
to Hub container environment
2016-05-13 10:44:29 +02:00
Min RK
12520da5bd Merge pull request #13 from jtyberg/make_build
Do not pull notebook image as part of build step.
2016-05-13 10:28:42 +02:00
Justin Tyberg
1d38273eef Do not pull notebook image as part of build step.
Do not assume the notebook image must be pulled from a Docker
registry (it might be built locally).
2016-05-12 16:50:02 -04:00
Carol Willing
31f6ebf073 Merge pull request #11 from minrk/configurable-home
allow configuring the notebook directory
2016-05-12 08:57:40 -07:00
Carol Willing
e12184aaf3 Merge pull request #12 from minrk/makefile
Add Makefile, simplify README
2016-05-12 08:54:43 -07:00
Min RK
60656fc818 Move docker-machine out of README
README now starts with the assumption that docker is setup.
The discrete volume, notebook, pull steps are also moved to "Behind the scenes",
and implied in `make build` in the setup.
Getting started is now:

1. GitHub OAuth
2. SSL
3. userlist
4. `make build`
5. `docker-compose up`
2016-05-12 16:53:22 +02:00
Min RK
d3a51902ae Add Makefile
`make build` builds the image, including network and volumes, and pulling the notebook image.
This removes the number of manual steps to get started.
2016-05-12 16:51:22 +02:00
Min RK
9e10f27b38 allow configuring the notebook directory
Makes it a bit easier if the image isn't based on docker-stacks.
2016-05-12 16:32:59 +02:00
Carol Willing
f5453b21a6 Merge pull request #10 from minrk/oauth-0.4
bump oauthenticator to 0.4
2016-05-11 07:16:19 -07:00
Min RK
2496467b7f bump oauthenticator to 0.4 2016-05-11 09:55:38 +02:00
Min RK
63f7c4b6cf Merge pull request #9 from jtyberg/unix_sock
Connect to Docker daemon on host through Unix socket.
2016-05-10 09:20:18 +02:00
Carol Willing
aa204d2f9f Merge pull request #8 from jtyberg/hub_script
Remove hub.sh script.
2016-05-09 18:21:02 -07:00
Justin Tyberg
65c2a7c3da Connect to Docker daemon on host through Unix socket.
Use Unix socket on host to communicate with daemon instead of
setting DOCKER_HOST and connecting using TLS over public IP.

(c) Copyright IBM Corp. 2016
2016-05-09 20:26:20 -04:00
Justin Tyberg
91a5e54d1b Remove hub.sh script.
The script was meant to facilitate hub build and run operations
while shielding new Docker users from `docker-compose`.  It now
provides very little functionality, and even gets in the way if
specifying GITHUB oauth environment variables in the .env file.

(c) Copyright IBM Corp. 2016
2016-05-09 19:20:05 -04:00
Min RK
842fbf67fb Merge pull request #7 from jtyberg/bump_061
Peg versions of JupyterHub base image and dependencies
2016-05-07 10:28:39 +01:00
Justin Tyberg
6edb1e1878 Update README to be more explicit about JHub TLS cert and key files.
(c) Copyright IBM Corp. 2016
2016-05-06 15:47:31 -04:00
Justin Tyberg
9516f3ed87 Peg version of JupyterHub base image.
Also peg versions of dependencies.

(c) Copyright IBM Corp. 2016
2016-05-06 15:19:03 -04:00
Justin Tyberg
c36da52a3d Merge pull request #5 from minrk/rm-docker-host
Don't call docker-machine in hub.sh
2016-04-26 08:46:03 -04:00
Min RK
408e413dd8 Don't call docker-machine in hub.sh
Setting docker env should be done outside the script.
2016-04-25 15:31:32 +02:00
Carol Willing
11fddae0a7 Merge pull request #4 from jtyberg/notebook-image-name
Rename DOCKER_CONTAINER_IMAGE => DOCKER_NOTEBOOK_IMAGE
2016-04-19 14:39:24 -07:00
Justin Tyberg
4bc8221657 Fix DOCKER_NOTEBOOK_IMAGE rename that was missed.
(c) Copyright IBM Corp. 2016
2016-04-19 16:49:28 -04:00
Justin Tyberg
e1b9f8ed9a Rename DOCKER_CONTAINER_IMAGE => DOCKER_NOTEBOOK_IMAGE
(c) Copyright IBM Corp. 2016
2016-04-19 12:21:46 -04:00
Justin Tyberg
d1d5fc4213 Merge pull request #3 from willingc/faq-edit
Edit FAQ
2016-04-19 08:24:12 -04:00
Carol Willing
7ac7c82040 More editing 2016-04-18 08:54:55 -07:00
Carol Willing
f1851d6dd3 A few more wording edits 2016-04-18 08:42:32 -07:00
Carol Willing
c8b2c94fcd Add concrete wording for pronoun references 2016-04-18 08:31:21 -07:00
Carol Willing
a7f38aaf2f Merge pull request #2 from jtyberg/custom-image-faq
Update README: add FAQs
2016-04-18 07:55:59 -07:00
Justin Tyberg
3fb61b1878 Add FAQs related to customizing Notebook image and restarting JupyterHub.
(c) Copyright IBM Corp. 2016
2016-04-18 09:47:00 -04:00
Min RK
07be477148 Merge pull request #1 from jtyberg/seed
Initial version.
2016-04-18 10:51:21 +02:00
Justin Tyberg
d8adee19af Do not strip protocol from DOCKER_HOST.
In Docker 1.10, including protocol in DOCKER_HOST caused failure
to connect to daemon on host machine.  Must have fixed in 1.11.

(c) Copyright IBM Corp. 2016
2016-04-15 16:02:12 -04:00
Justin Tyberg
917c5fbf16 Beef up README.
(c) Copyright IBM Corp. 2016
2016-04-15 16:02:05 -04:00
Justin Tyberg
18d68ce587 Add standard Jupyter LICENSE.
(c) Copyright IBM Corp. 2016
2016-04-14 15:54:19 -04:00
Justin Tyberg
73163c76b9 Initial version.
(c) Copyright IBM Corp. 2016
2016-04-14 15:17:14 -04:00
Min RK
e974a8f0b9 Initial commit 2016-04-14 15:53:15 +02:00