hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-18 15:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

make jupyterhub env->cli args optional

Browse Source 
DockerSpawner will stop passing these args,
so make them optional.
This commit is contained in:
Min RK
2017-08-10 15:40:35 +02:00
parent 82b978b3ce
commit 695a97e4a0
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
base-notebook/start-singleuser.sh
View File

@@ -4,19 +4,35 @@
set -e set -e
notebook_arg="" # set default ip to 0.0.0.0
if [ -n "${NOTEBOOK_DIR:+x}" ] if [[ "$NOTEBOOK_ARGS $@" != *"--ip="* ]]; then
then NOTEBOOK_ARGS="--ip=0.0.0.0 $NOTEBOOK_ARGS"
notebook_arg="--notebook-dir=${NOTEBOOK_DIR}"
fi fi
. /usr/local/bin/start.sh jupyterhub-singleuser \ # handle some deprecated environment variables
--port=${JPY_PORT:-8888} \ # from DockerSpawner < 0.8.
--ip=0.0.0.0 \ # These won't be passed from DockerSpawner 0.9,
--user=$JPY_USER \ # so avoid specifying --arg=empty-string
--cookie-name=$JPY_COOKIE_NAME \ if [ ! -z "$NOTEBOOK_DIR" ]; then
--base-url=$JPY_BASE_URL \ NOTEBOOK_ARGS="--notebook-dir=$NOTEBOOK_DIR $NOTEBOOK_ARGS"
--hub-prefix=$JPY_HUB_PREFIX \ fi
--hub-api-url=$JPY_HUB_API_URL \ if [ ! -z "$JPY_PORT" ]; then
${notebook_arg} \ NOTEBOOK_ARGS="--port=$JPY_PORT $NOTEBOOK_ARGS"
$@ fi
if [ ! -z "$JPY_USER" ]; then
NOTEBOOK_ARGS="--user=$JPY_USER $NOTEBOOK_ARGS"
fi
if [ ! -z "$JPY_COOKIE_NAME" ]; then
NOTEBOOK_ARGS="--cookie-name=$JPY_COOKIE_NAME $NOTEBOOK_ARGS"
fi
if [ ! -z "$JPY_BASE_URL" ]; then
NOTEBOOK_ARGS="--base-url=$JPY_BASE_URL $NOTEBOOK_ARGS"
fi
if [ ! -z "$JPY_HUB_PREFIX" ]; then
NOTEBOOK_ARGS="--hub-prefix=$JPY_HUB_PREFIX $NOTEBOOK_ARGS"
fi
if [ ! -z "$JPY_HUB_API_URL" ]; then
NOTEBOOK_ARGS="--hub-api-url=$JPY_HUB_API_URL $NOTEBOOK_ARGS"
fi
. /usr/local/bin/start.sh jupyterhub-singleuser $NOTEBOOK_ARGS $@