diff --git a/.env b/.env index 14d3861..280063c 100755 --- a/.env +++ b/.env @@ -19,10 +19,10 @@ DOCKER_MACHINE_NAME=jupyterhub DOCKER_NETWORK_NAME=jupyterhub-network # Single-user Jupyter Notebook server container image -DOCKER_NOTEBOOK_IMAGE=jupyter/base-notebook +DOCKER_NOTEBOOK_IMAGE=jupyter/datascience-notebook # the local image we use, after pinning jupyterhub version -LOCAL_NOTEBOOK_IMAGE=jupyterhub-user +LOCAL_NOTEBOOK_IMAGE=datascience-user # Notebook directory in the container. # This will be /home/jovyan/work if the default diff --git a/Dockerfile.jupyterhub b/Dockerfile.jupyterhub index 14d91fe..b466f76 100755 --- a/Dockerfile.jupyterhub +++ b/Dockerfile.jupyterhub @@ -10,7 +10,7 @@ RUN /opt/conda/bin/conda install -yq psycopg2=2.7 && \ oauthenticator==0.8.* \ dockerspawner==0.9.* - +RUN pip install jupyterhub-hashauthenticator # Copy TLS certificate and key #ENV SSL_CERT /srv/jupyterhub/secrets/jupyterhub.crt diff --git a/jupyterhub_config.py b/jupyterhub_config.py index de645f5..daf5975 100755 --- a/jupyterhub_config.py +++ b/jupyterhub_config.py @@ -13,8 +13,8 @@ c = get_config() # Spawn single-user servers as Docker containers c.JupyterHub.spawner_class = 'dockerspawner.DockerSpawner' # Spawn containers from this image -c.DockerSpawner.container_image = os.environ['DOCKER_NOTEBOOK_IMAGE'] -# c.DockerSpawner.container_image = "jupyter/scipy-notebook" +#c.DockerSpawner.container_image = os.environ['DOCKER_NOTEBOOK_IMAGE'] +c.DockerSpawner.container_image = "jupyter/datascience-notebook:7254cdcfa22b" # JupyterHub requires a single-user instance of the Notebook server, so we # default to using the `start-singleuser.sh` script included in the