diff --git a/spawnerdockerfile/Dockerfile.base b/spawnerdockerfile/Dockerfile.base old mode 100644 new mode 100755 index c913fae..6581bb2 --- a/spawnerdockerfile/Dockerfile.base +++ b/spawnerdockerfile/Dockerfile.base @@ -79,7 +79,6 @@ ARG HOME="/home/${CREATE_USER}" ARG DEBIAN_FRONTEND="noninteractive" ENV DEBIAN_FRONTEND=${DEBIAN_FRONTEND} -COPY install.sh /tmp RUN <> /etc/sudoers -# 安装micromamba -echo "1" | bash /tmp/install.sh -mkdir -p /home/${CREATE_USER}/micromamba -chown -R ${NB_UID}:${NB_GID} /home/${CREATE_USER}/micromamba # 安装 Jupyter 和相关软件 npm install -g configurable-http-proxy python3 -m pip install jupyterhub jupyterlab notebook radian pycurl jupyter-rsession-proxy ipykernel>=6.25.0 jupyterlab-language-pack-zh-CN jupyterlab-git jupyterlab-system-monitor jupyter_nbextensions_configurator jupyter_contrib_nbextensions jupyterlab_widgets jupyterlab-drawio jupyterlab-spreadsheet-editor jupyterlab-cell-flash jedi-language-server jupyterlab_code_formatter jupyterlab-spellchecker jupyterlab_vim nbresuse ipydrawio jedi ipympl black isort theme-darcula ipywidgets tensorboard jupyterlab_latex jupyter_bokeh autopep8 xeus-python jupyterlab-lsp python-lsp-server nglview dockerspawner jupyterhub-nativeauthenticator lckr_jupyterlab_variableinspector -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com @@ -106,25 +101,22 @@ EOT # Switch back to jovyan to avoid accidental container runs as root USER ${NB_UID} -ENV MAMBA_ROOT_PREFIX=/home/${CREATE_USER}/micromamba # install mojo -ENV PATH="/home/${CREATE_USER}/.local/bin:$PATH" -# A random default token -ARG AUTH_KEY="mut_efe460b898e3482bb6208bfcd4a51d7e" -ENV AUTH_KEY=$AUTH_KEY - -RUN curl https://get.modular.com | sh - && \ - modular auth $AUTH_KEY - ARG MODULAR_HOME="/home/${CREATE_USER}/.modular" ENV MODULAR_HOME=$MODULAR_HOME -ENV PATH="$PATH:$MODULAR_HOME/pkg/packages.modular.com_mojo/bin" +ENV PATH="$MODULAR_HOME/pkg/packages.modular.com_mojo/bin:/home/${CREATE_USER}/.local/bin:$PATH" RUN <> "$BASHRC" +echo 'export PATH="'$MOJO_PATH'/bin:$PATH"' >> "$BASHRC" +source "$BASHRC" EOT # Install Rust