diff options
| -rw-r--r-- | src/jupyterlab/feature.json | 6 | ||||
| -rw-r--r-- | src/jupyterlab/install.sh | 50 | ||||
| -rw-r--r-- | src/python/feature.json | 2 | ||||
| -rw-r--r-- | v1/feature-scripts.env | 4 |
4 files changed, 46 insertions, 16 deletions
diff --git a/src/jupyterlab/feature.json b/src/jupyterlab/feature.json index e080339..86010c3 100644 --- a/src/jupyterlab/feature.json +++ b/src/jupyterlab/feature.json @@ -7,6 +7,12 @@ "proposals": ["latest", "3.6.2"], "default": "latest", "description": "Select or enter a jupyterlab version." + }, + "pythonBinary": { + "type": "string", + "proposals": ["python", "/usr/local/python/bin/python"], + "default": "python", + "description": "Select or enter the python binary path." } }, "extensions": [ diff --git a/src/jupyterlab/install.sh b/src/jupyterlab/install.sh index 45267b0..f6c93f9 100644 --- a/src/jupyterlab/install.sh +++ b/src/jupyterlab/install.sh @@ -1,9 +1,20 @@ #!/usr/bin/env bash +#------------------------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. +#------------------------------------------------------------------------------------------------------------- +# +# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/jupyterlab.md +# Maintainer: The VS Code and Codespaces Teams +# +# Syntax: ./jupyter-debian.sh set -e VERSION=${1:-"latest"} USERNAME=${2:-"automatic"} +PYTHON=${3:-"python"} +ALLOW_ORIGIN=${4:-""} # If in automatic mode, determine if a user already exists, if not use vscode if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then @@ -24,9 +35,8 @@ elif [ "${USERNAME}" = "none" ]; then USER_GID=0 fi -# Use sudo to run as non-root user is not already running -sudoUserIf() -{ +# Make sure we run the command as non-root user +sudoUserIf() { if [ "$(id -u)" -eq 0 ] && [ "${USERNAME}" != "root" ]; then sudo -u ${USERNAME} "$@" else @@ -34,18 +44,32 @@ sudoUserIf() fi } -# If we don't yet have Python, install it now. -if ! python --version > /dev/null ; then +addToJupyterConfig() { + JUPYTER_DIR="/home/${USERNAME}/.jupyter" + JUPYTER_CONFIG="${JUPYTER_DIR}/jupyter_notebook_config.py" + + # Make sure the config file exists + test -d ${JUPYTER_DIR} || sudoUserIf mkdir ${JUPYTER_DIR} + test -f ${JUPYTER_CONFIG} || sudoUserIf touch ${JUPYTER_CONFIG} + + # Don't write the same line more than once + grep -q ${1} ${JUPYTER_CONFIG} || echo ${1} >> ${JUPYTER_CONFIG} +} + +# Make sure that Python is available +if ! ${PYTHON} --version > /dev/null ; then echo "You need to install Python before installing JupyterLab." exit 1 fi -# If we don't already have JupyterLab installed, install it now. -if ! jupyter-lab --version > /dev/null ; then - echo "Installing JupyterLab..." - if [ "${VERSION}" = "latest" ]; then - pip install jupyterlab - else - pip install jupyterlab=="${VERSION}" --no-cache-dir - fi +# pip skips installation if JupyterLab is already installed +echo "Installing JupyterLab..." +if [ "${VERSION}" = "latest" ]; then + sudoUserIf ${PYTHON} -m pip install jupyterlab --no-cache-dir +else + sudoUserIf ${PYTHON} -m pip install jupyterlab=="${VERSION}" --no-cache-dir +fi + +if [ "${ALLOW_ORIGIN}" = 'true' ]; then + addToJupyterConfig "c.ServerApp.allow_origin = '*'" fi diff --git a/src/python/feature.json b/src/python/feature.json index f451eb2..da77899 100644 --- a/src/python/feature.json +++ b/src/python/feature.json @@ -27,7 +27,7 @@ "default": false, "description": "Optimize Python for performance when compiled (slow)" }, - "install_path": { + "installPath": { "type": "string", "default": "/usr/local/python", "description": "The path where python will be installed." diff --git a/v1/feature-scripts.env b/v1/feature-scripts.env index 848302b..f7da4c4 100644 --- a/v1/feature-scripts.env +++ b/v1/feature-scripts.env @@ -10,7 +10,7 @@ _BUILD_ARG_AWS_CLI="./aws-cli/install.sh ${_B _BUILD_ARG_AZURE_CLI="./az-cli/install.sh ${_BUILD_ARG_AZURE_CLI_VERSION:-latest}" _BUILD_ARG_SSH="./sshd/install.sh" _BUILD_ARG_NODE="./node/install.sh /usr/local/share/nvm ${_BUILD_ARG_NODE_VERSION:-lts/*} automatic true ${_BUILD_ARG_NODE_NODEGYPDEPENDENCIES:-true}" -_BUILD_ARG_PYTHON="./python/install.sh ${_BUILD_ARG_PYTHON_VERSION:-latest} /usr/local/python /usr/local/py-utils automatic true ${_BUILD_ARG_PYTHON_INSTALLTOOLS:-true} true ${_BUILD_ARG_PYTHON_OPTIMIZE:-false}" +_BUILD_ARG_PYTHON="./python/install.sh ${_BUILD_ARG_PYTHON_VERSION:-latest} ${_BUILD_ARG_PYTHON_INSTALLPATH:-/usr/local/python} /usr/local/py-utils automatic true ${_BUILD_ARG_PYTHON_INSTALLTOOLS:-true} true ${_BUILD_ARG_PYTHON_OPTIMIZE:-false}" _BUILD_ARG_GOLANG="./go/install.sh ${_BUILD_ARG_GOLANG_VERSION:-latest}" _BUILD_ARG_JAVA="./java/wrapper.sh ${_BUILD_ARG_JAVA_VERSION:-latest}" _BUILD_ARG_GRADLE="./gradle/install.sh ${_BUILD_ARG_GRADLE_VERSION:-latest}" @@ -20,4 +20,4 @@ _BUILD_ARG_RUST="./rust/install.sh /usr _BUILD_ARG_POWERSHELL="./powershell/install.sh ${_BUILD_ARG_POWERSHELL_VERSION:-latest}" _BUILD_ARG_DESKTOP_LITE="./desktop-lite/install.sh automatic ${_BUILD_ARG_DESKTOP_LITE_PASSWORD:-vscode} true ${_BUILD_ARG_DESKTOP_LITE_VNCPORT:-5901} ${_BUILD_ARG_DESKTOP_LITE_WEBPORT:-6080}" _BUILD_ARG_DOTNET="./dotnet/install.sh ${_BUILD_ARG_DOTNET_VERSION:-latest} ${_BUILD_ARG_DOTNET_RUNTIMEONLY:-false} automatic true /usr/local/dotnet dotnet" -_BUILD_ARG_JUPYTERLAB="./jupyterlab/install.sh ${_BUILD_ARG_JUPYTERLAB_VERSION:-latest}" +_BUILD_ARG_JUPYTERLAB="./jupyterlab/install.sh ${_BUILD_ARG_JUPYTERLAB_VERSION:-latest}" automatic ${_BUILD_ARG_JUPYTERLAB_PYTHONBINARY:-python}" true |