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

Merge pull request #759 from dungdm93/master

Browse Source 
fixing inline script problem
This commit is contained in:
Peter Parente
2018-12-29 11:29:19 -05:00
committed by GitHub
parent 9b06df75e4 0329eecec8
commit 17aba6048f
4 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base-notebook/fix-permissions
View File

@@ -17,7 +17,7 @@
set -e set -e
for d in $@; do for d in "$@"; do
find "$d" \ find "$d" \
! \( \ ! \( \
-group $NB_GID \ -group $NB_GID \

10
base-notebook/start-notebook.sh
View File

@@ -6,11 +6,9 @@ set -e
if [[ ! -z "${JUPYTERHUB_API_TOKEN}" ]]; then if [[ ! -z "${JUPYTERHUB_API_TOKEN}" ]]; then
# launched by JupyterHub, use single-user entrypoint # launched by JupyterHub, use single-user entrypoint
exec /usr/local/bin/start-singleuser.sh $* exec /usr/local/bin/start-singleuser.sh "$@"
elif [[ ! -z "${JUPYTER_ENABLE_LAB}" ]]; then
. /usr/local/bin/start.sh jupyter lab "$@"
else else
if [[ ! -z "${JUPYTER_ENABLE_LAB}" ]]; then . /usr/local/bin/start.sh jupyter notebook "$@"
. /usr/local/bin/start.sh jupyter lab $*
else
. /usr/local/bin/start.sh jupyter notebook $*
fi
fi fi

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

@@ -37,7 +37,7 @@ fi
if [ ! -z "$JUPYTER_ENABLE_LAB" ]; then if [ ! -z "$JUPYTER_ENABLE_LAB" ]; then
NOTEBOOK_BIN="jupyter labhub" NOTEBOOK_BIN="jupyter labhub"
else else
NOTEBOOK_BIN=jupyterhub-singleuser NOTEBOOK_BIN="jupyterhub-singleuser"
fi fi
. /usr/local/bin/start.sh $NOTEBOOK_BIN $NOTEBOOK_ARGS $@ . /usr/local/bin/start.sh $NOTEBOOK_BIN $NOTEBOOK_ARGS "$@"

46
base-notebook/start.sh
View File

@@ -6,32 +6,32 @@ set -e
# Exec the specified command or fall back on bash # Exec the specified command or fall back on bash
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
cmd=bash cmd=( "bash" )
else else
cmd=$* cmd=( "$@" )
fi fi
run-hooks () { run-hooks () {
# Source scripts or run executable files in a directory # Source scripts or run executable files in a directory
if [[ ! -d "$1" ]] ; then if [[ ! -d "$1" ]] ; then
return return
fi fi
echo "$0: running hooks in $1" echo "$0: running hooks in $1"
for f in "$1"/*; do for f in "$1/"*; do
case "$f" in case "$f" in
*.sh) *.sh)
echo "$0: running $f" echo "$0: running $f"
source "$f" source "$f"
;; ;;
*) *)
if [[ -x "$f" ]] ; then if [[ -x "$f" ]] ; then
echo "$0: running $f" echo "$0: running $f"
"$f" "$f"
else else
echo "$0: ignoring $f" echo "$0: ignoring $f"
fi fi
;; ;;
esac esac
echo "$0: done running hooks in $1" echo "$0: done running hooks in $1"
done done
} }
@@ -86,7 +86,7 @@ if [ $(id -u) == 0 ] ; then
if [ "$NB_GID" != $(id -g $NB_USER) ] ; then if [ "$NB_GID" != $(id -g $NB_USER) ] ; then
echo "Add $NB_USER to group: $NB_GID" echo "Add $NB_USER to group: $NB_GID"
groupadd -g $NB_GID -o ${NB_GROUP:-${NB_USER}} groupadd -g $NB_GID -o ${NB_GROUP:-${NB_USER}}
usermod -g $NB_GID -a -G $NB_GID,100 $NB_USER usermod -g $NB_GID -aG 100 $NB_USER
fi fi
# Enable sudo if requested # Enable sudo if requested
@@ -101,8 +101,8 @@ if [ $(id -u) == 0 ] ; then
# Exec the command as NB_USER with the PATH and the rest of # Exec the command as NB_USER with the PATH and the rest of
# the environment preserved # the environment preserved
run-hooks /usr/local/bin/before-notebook.d run-hooks /usr/local/bin/before-notebook.d
echo "Executing the command: $cmd" echo "Executing the command: ${cmd[@]}"
exec sudo -E -H -u $NB_USER PATH=$PATH XDG_CACHE_HOME=/home/$NB_USER/.cache PYTHONPATH=$PYTHONPATH $cmd exec sudo -E -H -u $NB_USER PATH=$PATH XDG_CACHE_HOME=/home/$NB_USER/.cache PYTHONPATH=$PYTHONPATH "${cmd[@]}"
else else
if [[ "$NB_UID" == "$(id -u jovyan)" && "$NB_GID" == "$(id -g jovyan)" ]]; then if [[ "$NB_UID" == "$(id -u jovyan)" && "$NB_GID" == "$(id -g jovyan)" ]]; then
# User is not attempting to override user/group via environment # User is not attempting to override user/group via environment
@@ -145,6 +145,6 @@ else
# Execute the command # Execute the command
run-hooks /usr/local/bin/before-notebook.d run-hooks /usr/local/bin/before-notebook.d
echo "Executing the command: $cmd" echo "Executing the command: ${cmd[@]}"
exec $cmd exec "${cmd[@]}"
fi fi