Merge pull request #3035 from berkeley-dsep-infra/staging

Merge #3032, #3033, #3034 to prod
berkeley-dsep-infra · Nov 19, 2021 · 9ca8272 · 9ca8272
2 parents 7ada4e6 + 820b277
commit 9ca8272
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml
@@ -33,6 +33,9 @@ jupyterhub:
         tag: 0.0.1-n3657.h4f7f88c
   singleuser:
     defaultUrl: "/lab"
+    cmd:
+    - jupyterhub-singleuser
+    - --LabApp.collaborative=true
     extraContainers:
       - name: postgres
         image: gcr.io/ucb-datahub-2018/jupyterhub-postgres:0.0.1-n3657.h4f7f88c

diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml
@@ -88,9 +88,6 @@ jupyterhub:
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool
   singleuser:
-    cmd:
-    - jupyterhub-singleuser
-    - --LabApp.collaborative=true
     nodeSelector:
       hub.jupyter.org/pool-name: alpha-pool
     storage:

diff --git a/deployments/datahub/images/default/Dockerfile b/deployments/datahub/images/default/Dockerfile
@@ -255,6 +255,10 @@ ADD ipython_config.py ${IPYTHONDIR}/ipython_config.py
 # install QGrid notebook extension
 RUN jupyter nbextension enable --py --sys-prefix qgrid
 
+# Temporarily install newer version of jupyterlab-link-share
+# Move this back to just installing off infra-requirements once we are a bit stable
+RUN pip install -U jupyterlab-link-share==0.2.3
+
 EXPOSE 8888
 
 ENTRYPOINT ["tini", "--"]