From 05d27f0b087dedde1beb0f017877c83089bf4361 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Sat, 17 Oct 2020 18:43:39 +0530
Subject: [PATCH 1/2] Set SHELL to /bin/bash for all hubs

Was inconsistently set via jupyter_notebook_config.py
in some hubs, and only specific to Jupyter Notebooks. This
sets it more generally, and does it for all hubs.

Fixes #1890
---
 .../data100/image/jupyter_notebook_config.py     | 12 ------------
 .../data102/image/jupyter_notebook_config.py     | 12 ------------
 .../images/default/jupyter_notebook_config.py    |  9 ---------
 .../prob140/image/jupyter_notebook_config.py     | 16 ----------------
 .../stat89a/image/jupyter_notebook_config.py     |  2 --
 hub/values.yaml                                  |  2 ++
 jupyter_notebook_config.py                       | 12 ------------
 7 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 deployments/data100/image/jupyter_notebook_config.py
 delete mode 100644 deployments/data102/image/jupyter_notebook_config.py
 delete mode 100644 deployments/datahub/images/default/jupyter_notebook_config.py
 delete mode 100644 deployments/prob140/image/jupyter_notebook_config.py
 delete mode 100755 deployments/stat89a/image/jupyter_notebook_config.py
 delete mode 100644 jupyter_notebook_config.py

diff --git a/deployments/data100/image/jupyter_notebook_config.py b/deployments/data100/image/jupyter_notebook_config.py
deleted file mode 100644
index f14034003..000000000
--- a/deployments/data100/image/jupyter_notebook_config.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is sh (dash) by default, not $SHELL
-c.NotebookApp.terminado_settings = { "shell_command": ["bash"] }
-
-c.ServerProxy.servers = {
-  'http-server': {
-    'command': ['python3', '-m', 'http.server', '{port}'],
-    'absolute_url': False,
-    'launcher_entry': {
-      'title': "HTTP Server"
-    }
-  }
-}
diff --git a/deployments/data102/image/jupyter_notebook_config.py b/deployments/data102/image/jupyter_notebook_config.py
deleted file mode 100644
index f14034003..000000000
--- a/deployments/data102/image/jupyter_notebook_config.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is sh (dash) by default, not $SHELL
-c.NotebookApp.terminado_settings = { "shell_command": ["bash"] }
-
-c.ServerProxy.servers = {
-  'http-server': {
-    'command': ['python3', '-m', 'http.server', '{port}'],
-    'absolute_url': False,
-    'launcher_entry': {
-      'title': "HTTP Server"
-    }
-  }
-}
diff --git a/deployments/datahub/images/default/jupyter_notebook_config.py b/deployments/datahub/images/default/jupyter_notebook_config.py
deleted file mode 100644
index c3f369440..000000000
--- a/deployments/datahub/images/default/jupyter_notebook_config.py
+++ /dev/null
@@ -1,9 +0,0 @@
-c.ServerProxy.servers = {
-  'http-server': {
-    'command': ['python3', '-m', 'http.server', '{port}'],
-    'absolute_url': False,
-    'launcher_entry': {
-      'title': "HTTP Server"
-    }
-  }
-}
diff --git a/deployments/prob140/image/jupyter_notebook_config.py b/deployments/prob140/image/jupyter_notebook_config.py
deleted file mode 100644
index 5f088ead5..000000000
--- a/deployments/prob140/image/jupyter_notebook_config.py
+++ /dev/null
@@ -1,16 +0,0 @@
-c.ServerProxy.servers = {
-  'http-server': {
-    'command': ['python3', '-m', 'http.server', '{port}'],
-    'absolute_url': False,
-    'launcher_entry': {
-      'title': "HTTP Server"
-    }
-  }
-}
-
-
-# Use memory for notebook notary file to workaround corrupted files on nfs
-# https://www.sqlite.org/inmemorydb.html
-# https://github.com/jupyter/jupyter/issues/174
-# https://github.com/ipython/ipython/issues/9163
-c.NotebookNotary.db_file = ":memory:"
\ No newline at end of file
diff --git a/deployments/stat89a/image/jupyter_notebook_config.py b/deployments/stat89a/image/jupyter_notebook_config.py
deleted file mode 100755
index 150c3ea51..000000000
--- a/deployments/stat89a/image/jupyter_notebook_config.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# This is sh (dash) by default, not $SHELL
-c.NotebookApp.terminado_settings = { "shell_command": ["bash"] }
diff --git a/hub/values.yaml b/hub/values.yaml
index 38c74dff1..484cf455d 100644
--- a/hub/values.yaml
+++ b/hub/values.yaml
@@ -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:
diff --git a/jupyter_notebook_config.py b/jupyter_notebook_config.py
deleted file mode 100644
index f14034003..000000000
--- a/jupyter_notebook_config.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is sh (dash) by default, not $SHELL
-c.NotebookApp.terminado_settings = { "shell_command": ["bash"] }
-
-c.ServerProxy.servers = {
-  'http-server': {
-    'command': ['python3', '-m', 'http.server', '{port}'],
-    'absolute_url': False,
-    'launcher_entry': {
-      'title': "HTTP Server"
-    }
-  }
-}

From 79dc7e6c42cbb646454b9ea7043ca774c1bd9673 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Sat, 17 Oct 2020 20:29:39 +0530
Subject: [PATCH 2/2] Don't copy non-existent jupyter_notebook_config.py

---
 deployments/data100/image/Dockerfile          | 1 -
 deployments/datahub/images/default/Dockerfile | 1 -
 deployments/prob140/image/postBuild           | 1 -
 deployments/stat89a/image/postBuild           | 1 -
 4 files changed, 4 deletions(-)

diff --git a/deployments/data100/image/Dockerfile b/deployments/data100/image/Dockerfile
index 35341ebff..e278040db 100644
--- a/deployments/data100/image/Dockerfile
+++ b/deployments/data100/image/Dockerfile
@@ -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/
 
diff --git a/deployments/datahub/images/default/Dockerfile b/deployments/datahub/images/default/Dockerfile
index dd37a66e9..37842680d 100644
--- a/deployments/datahub/images/default/Dockerfile
+++ b/deployments/datahub/images/default/Dockerfile
@@ -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
diff --git a/deployments/prob140/image/postBuild b/deployments/prob140/image/postBuild
index 704f7f51a..26234c4b6 100644
--- a/deployments/prob140/image/postBuild
+++ b/deployments/prob140/image/postBuild
@@ -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}
diff --git a/deployments/stat89a/image/postBuild b/deployments/stat89a/image/postBuild
index 3cd52a70e..f6d8e529c 100755
--- a/deployments/stat89a/image/postBuild
+++ b/deployments/stat89a/image/postBuild
@@ -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