From 575787f3152d2e60801e9d006cd110343e4f0feb Mon Sep 17 00:00:00 2001 From: Justin Tyberg Date: Mon, 1 Aug 2016 16:57:16 -0400 Subject: [PATCH 1/3] Bump to Dockerspawner 0.4. (c) Copyright IBM Corp. 2016 --- Dockerfile.jupyterhub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.jupyterhub b/Dockerfile.jupyterhub index b0371f5..16d9bf0 100644 --- a/Dockerfile.jupyterhub +++ b/Dockerfile.jupyterhub @@ -6,7 +6,7 @@ FROM jupyterhub/jupyterhub-onbuild:0.6.1 RUN /opt/conda/bin/pip install \ jupyterhub==0.6.* \ oauthenticator==0.4.* \ - dockerspawner==0.3.* + dockerspawner==0.4.* # Copy TLS certificate and key ENV SSL_CERT /srv/jupyterhub/secrets/jupyterhub.crt From 4c896ffe64bbd1ee7c77a6ed86609716bae8d26c Mon Sep 17 00:00:00 2001 From: Justin Tyberg Date: Mon, 1 Aug 2016 16:58:01 -0400 Subject: [PATCH 2/3] 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 --- jupyterhub_config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/jupyterhub_config.py b/jupyterhub_config.py index 026698a..84dbce5 100644 --- a/jupyterhub_config.py +++ b/jupyterhub_config.py @@ -27,7 +27,6 @@ c.DockerSpawner.use_internal_ip = True c.DockerSpawner.network_name = network_name # Pass the network name as argument to spawned containers c.DockerSpawner.extra_host_config = { 'network_mode': network_name } -c.DockerSpawner.extra_start_kwargs = { 'network_mode': network_name } # Explicitly set notebook directory because we'll be mounting a host volume to # it. Most jupyter/docker-stacks *-notebook images run the Notebook server as # user `jovyan`, and set the notebook directory to `/home/jovyan/work`. From b5e5453d4fe5462507053596fd894f5c4fdeb8dd Mon Sep 17 00:00:00 2001 From: Justin Tyberg Date: Mon, 1 Aug 2016 17:04:25 -0400 Subject: [PATCH 3/3] Bump minimum Docker version to 1.12 in README. (c) Copyright IBM Corp. 2016 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b03755..dfdfeda 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ This deployment is **NOT** intended for a production environment. ## Prerequisites * This deployment uses Docker for all the things, via [Docker Compose](https://docs.docker.com/compose/overview/). - It requires [Docker Toolbox](https://www.docker.com/products/docker-toolbox) 1.11.0 or higher. + It requires [Docker Engine](https://docs.docker.com/engine) 1.12.0 or higher. See the [installation instructions](https://docs.docker.com/engine/installation/) for your environment. * This example configures JupyterHub for HTTPS connections (the default). As such, you must provide TLS certificate chain and key files to the JupyterHub server.