Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set SHELL to /bin/bash for all hubs #1908

Merged
merged 2 commits into from
Oct 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion deployments/data100/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ COPY infra-requirements.txt /tmp/
RUN conda env update -p ${CONDA_DIR} -f /tmp/environment.yml

# Set bash as shell in terminado.
ADD jupyter_notebook_config.py ${CONDA_PREFIX}/envs/data100/etc/jupyter/
# Disable history.
ADD ipython_config.py ${CONDA_PREFIX}/envs/data100/etc/ipython/

Expand Down
12 changes: 0 additions & 12 deletions deployments/data100/image/jupyter_notebook_config.py

This file was deleted.

12 changes: 0 additions & 12 deletions deployments/data102/image/jupyter_notebook_config.py

This file was deleted.

1 change: 0 additions & 1 deletion deployments/datahub/images/default/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ COPY connectors/2019-fall-phys-188-288.bash /usr/local/sbin/
RUN /usr/local/sbin/2019-fall-phys-188-288.bash

ADD ipython_config.py ${IPYTHONDIR}/ipython_config.py
ADD jupyter_notebook_config.py ${CONDA_DIR}/etc/jupyter/jupyter_notebook_config.py

# install gmaps notebook extension
RUN jupyter nbextension enable --py --sys-prefix gmaps
Expand Down
9 changes: 0 additions & 9 deletions deployments/datahub/images/default/jupyter_notebook_config.py

This file was deleted.

16 changes: 0 additions & 16 deletions deployments/prob140/image/jupyter_notebook_config.py

This file was deleted.

1 change: 0 additions & 1 deletion deployments/prob140/image/postBuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ set -euo pipefail

mkdir -p ${CONDA_DIR}/etc/ipython ${CONDA_DIR}/etc/jupyter
cp -p ipython_config.py ${CONDA_DIR}/etc/ipython/
cp -p jupyter_notebook_config.py ${CONDA_DIR}/etc/jupyter/

# Set up notebook-as-pdf dependencies
export PYPPETEER_HOME=${CONDA_DIR}
Expand Down
2 changes: 0 additions & 2 deletions deployments/stat89a/image/jupyter_notebook_config.py

This file was deleted.

1 change: 0 additions & 1 deletion deployments/stat89a/image/postBuild
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set -euo pipefail
mkdir -p ${CONDA_DIR}/etc/ipython
cp ipython_config.py ${CONDA_DIR}/etc/ipython/ipython_config.py
mkdir -p ${CONDA_DIR}/etc/jupyter
cp jupyter_notebook_config.py ${CONDA_DIR}/etc/jupyter/jupyter_notebook_config.py
mkdir -p ${CONDA_DIR}/share/jupyter/lab/settings
#cp overrides.json ${CONDA_DIR}/share/jupyter/lab/settings/overrides.json
mkdir -p $HOME/.jupyter/lab/user-settings/@jupyterlab/apputils-extension
Expand Down
2 changes: 2 additions & 0 deletions hub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ jupyterhub:
networkPolicy:
enabled: true
singleuser:
extraEnv:
SHELL: /bin/bash
startTimeout: 600 # 10 mins, because sometimes we have too many new nodes coming up together
defaultUrl: /tree
networkPolicy:
Expand Down
12 changes: 0 additions & 12 deletions jupyter_notebook_config.py

This file was deleted.