Commit Graph

76 Commits

Author SHA1 Message Date
Min RK
7a129c42bf bump oauthenticator, dockerspawner 2017-10-03 16:02:25 +02:00
Carol Willing
9ab7441312 Merge pull request #44 from jupyterhub/mention-zero-to-jupyterhub-k8s
Mention zero-to-jupyterhub-k8s project in README
2017-09-02 08:07:47 -05:00
Justin Tyberg
20f60f7374 Mention zero-to-jupyterhub-k8s project in README 2017-09-01 22:39:55 -04:00
Carol Willing
d6657a77ae Merge pull request #42 from fm75/master
Update and rename LICENSE.md to LICENSE
2017-08-26 22:14:03 -04:00
Fred Mitchell
7e2d9c9f3f Update and rename LICENSE.md to LICENSE 2017-08-26 12:17:17 -04:00
Justin Tyberg
30be6397a6 Merge pull request #38 from bryanwweber/fix-makefile
Add oauth.env target to Makefile
2017-08-23 22:45:20 -04:00
Bryan W. Weber
8d887f7a38
Add oauth.env target to Makefile
Since 6917060, docker compose relies on an oauth.env file to get
the OAuth parameters, so the Makefile is updated to handle here
this change. In addition, the README is updated.
2017-08-23 09:22:45 -04:00
Min RK
ac6468e312 bump notebook tag 2017-08-20 09:57:18 +02:00
Min RK
e13b7c9407 update oauthenticator, dockerspawner 2017-08-16 16:44:30 +02:00
Min RK
7389e16821 docker package is not required for dockerspawner 2017-08-16 16:44:15 +02:00
Carol Willing
4d823a7fe0 Create CONTRIBUTING.md 2017-08-04 04:06:01 -07:00
Carol Willing
a9dfabe7c5 Merge pull request #37 from minrk/postgres
use postgres for the database
2017-08-03 09:54:52 -07:00
Min RK
6917060215 use postgres for the database 2017-08-02 22:26:29 +02:00
Min RK
a671e520fd Merge pull request #23 from willingc/user-docs
[WIP] Edit README  to be more user friendly
2017-08-02 22:22:41 +02:00
Carol Willing
cc3162f216 Merge pull request #35 from jtyberg/bump-0.7.2
Bump JupyterHub version to 0.7.2
2017-06-02 07:15:05 -07:00
Justin Tyberg
e38ccb55e1 Bump default notebook image tag 2017-06-02 09:49:31 -04:00
Justin Tyberg
8cad061ff6 Bump to JupyterHub 0.7.2, dockerspawner 0.7 2017-06-02 09:49:10 -04:00
Peter Parente
3061308897 Merge pull request #27 from jtyberg/jupyterlab
Add JupyterLab example
2016-12-10 22:25:07 -05:00
Justin Tyberg
6d6411d8f7 Add JupyterLab example
(c) Copyright IBM Corp. 2016
2016-12-10 22:07:58 -05:00
Justin Tyberg
2a43a89dfb Merge pull request #31 from jtyberg/jhub-0.7
Bump versions of hub dependencies, notebook image
2016-12-07 09:31:56 -05:00
Justin Tyberg
4a8042311e Bump default notebook image tag
Use image that includes JupyterHub 0.7.

(c) Copyright IBM Corp. 2016
2016-12-06 09:21:53 -05:00
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
Carol Willing
c89e4ec0d0 Edit section on building the hub image 2016-10-12 05:29:30 -07:00
Carol Willing
00068ee64a Add more precise instructions for OAuth 2016-10-12 05:18:23 -07:00
Carol Willing
dd964ade79 Edit letsencrypt example README 2016-10-12 05:13:36 -07:00
Carol Willing
ccd512c6ea Edit prerequisites and OAuth 2016-10-11 23:23:17 -07:00
Carol Willing
d99aa82642 Edit intro, tech overview, prerequisites 2016-10-11 20:58:14 -07: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