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

Prepend $CONDA_DIR/bin instead of appending

Browse Source 
Fixes #1053
This commit is contained in:
Ben Mares
2020-03-27 18:39:38 +01:00
committed by Ben Mares
parent 0eb36d778d
commit 5b7431886f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
base-notebook/start.sh
View File

@@ -150,8 +150,8 @@ if [ "$(id -u)" == 0 ] ; then
# Update potentially outdated environment variables since image build # Update potentially outdated environment variables since image build
export XDG_CACHE_HOME="/home/${NB_USER}/.cache" export XDG_CACHE_HOME="/home/${NB_USER}/.cache"
# Add ${CONDA_DIR}/bin to sudo secure_path # Prepend ${CONDA_DIR}/bin to sudo secure_path
sed -r "s#Defaults\s+secure_path\s*=\s*\"?([^\"]+)\"?#Defaults secure_path=\"\1:${CONDA_DIR}/bin\"#" /etc/sudoers | grep secure_path > /etc/sudoers.d/path sed -r "s#Defaults\s+secure_path\s*=\s*\"?([^\"]+)\"?#Defaults secure_path=\"${CONDA_DIR}/bin:\1\"#" /etc/sudoers | grep secure_path > /etc/sudoers.d/path
# Optionally grant passwordless sudo rights for the desired user # Optionally grant passwordless sudo rights for the desired user
if [[ "$GRANT_SUDO" == "1" || "$GRANT_SUDO" == "yes" ]]; then if [[ "$GRANT_SUDO" == "1" || "$GRANT_SUDO" == "yes" ]]; then
@@ -168,6 +168,12 @@ if [ "$(id -u)" == 0 ] ; then
PATH="${PATH}" \ PATH="${PATH}" \
PYTHONPATH="${PYTHONPATH:-}" \ PYTHONPATH="${PYTHONPATH:-}" \
"${cmd[@]}" "${cmd[@]}"
# Note on the purpose of "PATH=${PATH}":
# In case "${cmd[@]}" is "bash", then PATH will be used by this bash shell.
# However, PATH is irrelevant to how the above sudo command resolves the
# path of "${cmd[@]}". Sudo's path resolution is done via the "secure_path"
# variable set above in /etc/sudoers.d/path.
# The container didn't start as the root user, so we will have to act as the # The container didn't start as the root user, so we will have to act as the
# user we started as. # user we started as.