Merge pull request #17 from jtyberg/issue-16

Do not pass host config options in start_kwargs
This commit is contained in:
Min RK 2016-08-02 11:34:36 +02:00 committed by GitHub
commit 76aa995ae2
3 changed files with 2 additions and 3 deletions

View File

@ -6,7 +6,7 @@ FROM jupyterhub/jupyterhub-onbuild:0.6.1
RUN /opt/conda/bin/pip install \ RUN /opt/conda/bin/pip install \
jupyterhub==0.6.* \ jupyterhub==0.6.* \
oauthenticator==0.4.* \ oauthenticator==0.4.* \
dockerspawner==0.3.* dockerspawner==0.4.*
# Copy TLS certificate and key # Copy TLS certificate and key
ENV SSL_CERT /srv/jupyterhub/secrets/jupyterhub.crt ENV SSL_CERT /srv/jupyterhub/secrets/jupyterhub.crt

View File

@ -26,7 +26,7 @@ This deployment is **NOT** intended for a production environment.
## Prerequisites ## Prerequisites
* This deployment uses Docker for all the things, via [Docker Compose](https://docs.docker.com/compose/overview/). * 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. See the [installation instructions](https://docs.docker.com/engine/installation/) for your environment.
* This example configures JupyterHub for HTTPS connections (the default). * This example configures JupyterHub for HTTPS connections (the default).
As such, you must provide TLS certificate chain and key files to the JupyterHub server. As such, you must provide TLS certificate chain and key files to the JupyterHub server.

View File

@ -27,7 +27,6 @@ c.DockerSpawner.use_internal_ip = True
c.DockerSpawner.network_name = network_name c.DockerSpawner.network_name = network_name
# Pass the network name as argument to spawned containers # Pass the network name as argument to spawned containers
c.DockerSpawner.extra_host_config = { 'network_mode': network_name } 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 # 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 # it. Most jupyter/docker-stacks *-notebook images run the Notebook server as
# user `jovyan`, and set the notebook directory to `/home/jovyan/work`. # user `jovyan`, and set the notebook directory to `/home/jovyan/work`.