mm/jupyterhub-deploy-docker
1
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #47 from minrk/08

Browse Source 
Use JUPYTERHUB_VERSION as a build arg
This commit is contained in:
Min RK 2017-10-13 13:09:51 +02:00 committed by GitHub
commit c02a505d5b
5 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env
View File

@ -7,6 +7,7 @@
# are not set in the shell environment. # are not set in the shell environment.
# To override these values, set the shell environment variables. # To override these values, set the shell environment variables.
JUPYTERHUB_VERSION=0.8.0
# Name of Docker machine # Name of Docker machine
DOCKER_MACHINE_NAME=jupyterhub DOCKER_MACHINE_NAME=jupyterhub
@ -15,7 +16,10 @@ DOCKER_MACHINE_NAME=jupyterhub
DOCKER_NETWORK_NAME=jupyterhub-network DOCKER_NETWORK_NAME=jupyterhub-network
# Single-user Jupyter Notebook server container image # Single-user Jupyter Notebook server container image
DOCKER_NOTEBOOK_IMAGE=jupyter/scipy-notebook:8f56e3c47fec DOCKER_NOTEBOOK_IMAGE=jupyter/minimal-notebook:e1677043235c
# the local image we use, after pinning jupyterhub version
LOCAL_NOTEBOOK_IMAGE=jupyterhub-user
# Notebook directory in the container. # Notebook directory in the container.
# This will be /home/jovyan/work if the default # This will be /home/jovyan/work if the default

11
Dockerfile.jupyterhub
View File

@ -1,13 +1,14 @@
# Copyright (c) Jupyter Development Team. # Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License. # Distributed under the terms of the Modified BSD License.
FROM jupyterhub/jupyterhub-onbuild:0.7.2 ARG JUPYTERHUB_VERSION
FROM jupyterhub/jupyterhub-onbuild:$JUPYTERHUB_VERSION
# Install dockerspawner, oauth, postgres # Install dockerspawner, oauth, postgres
RUN /opt/conda/bin/conda install psycopg2=2.7 && \ RUN /opt/conda/bin/conda install -yq psycopg2=2.7 && \
/opt/conda/bin/conda clean -tipsy && \ /opt/conda/bin/conda clean -tipsy && \
/opt/conda/bin/pip install \ /opt/conda/bin/pip install --no-cache-dir \
oauthenticator==0.6.* \ oauthenticator==0.7.* \
dockerspawner==0.8.* dockerspawner==0.9.*
# 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

6
Makefile
View File

@ -50,7 +50,11 @@ check-files: userlist $(cert_files) secrets/oauth.env secrets/postgres.env
pull: pull:
docker pull $(DOCKER_NOTEBOOK_IMAGE) docker pull $(DOCKER_NOTEBOOK_IMAGE)
notebook_image: pull notebook_image: pull singleuser/Dockerfile
docker build -t $(LOCAL_NOTEBOOK_IMAGE) \
--build-arg JUPYTERHUB_VERSION=$(JUPYTERHUB_VERSION) \
--build-arg DOCKER_NOTEBOOK_IMAGE=$(DOCKER_NOTEBOOK_IMAGE) \
singleuser
build: check-files network volumes build: check-files network volumes
docker-compose build docker-compose build

4
docker-compose.yml
View File

@ -23,6 +23,8 @@ services:
build: build:
context: . context: .
dockerfile: Dockerfile.jupyterhub dockerfile: Dockerfile.jupyterhub
args:
JUPYTERHUB_VERSION: ${JUPYTERHUB_VERSION}
restart: always restart: always
image: jupyterhub image: jupyterhub
container_name: jupyterhub container_name: jupyterhub
@ -40,7 +42,7 @@ services:
# All containers will join this network # All containers will join this network
DOCKER_NETWORK_NAME: ${DOCKER_NETWORK_NAME} DOCKER_NETWORK_NAME: ${DOCKER_NETWORK_NAME}
# JupyterHub will spawn this Notebook image for users # JupyterHub will spawn this Notebook image for users
DOCKER_NOTEBOOK_IMAGE: ${DOCKER_NOTEBOOK_IMAGE} DOCKER_NOTEBOOK_IMAGE: ${LOCAL_NOTEBOOK_IMAGE}
# Notebook directory inside user image # Notebook directory inside user image
DOCKER_NOTEBOOK_DIR: ${DOCKER_NOTEBOOK_DIR} DOCKER_NOTEBOOK_DIR: ${DOCKER_NOTEBOOK_DIR}
# Using this run command (optional) # Using this run command (optional)

4
singleuser/Dockerfile Normal file
View File

@ -0,0 +1,4 @@
ARG DOCKER_NOTEBOOK_IMAGE
FROM $DOCKER_NOTEBOOK_IMAGE
ARG JUPYTERHUB_VERSION
RUN python3 -m pip install --no-cache jupyterhub==$JUPYTERHUB_VERSION