From 97dd4593c078419b897a9990a07b7430743184d9 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 19 Nov 2021 13:41:14 +0530 Subject: [PATCH 1/3] Enable RTC in data100 hub, not datahub @fperez is very happy to dogfood this. Let's try it out here instead of in the main datahub --- deployments/data100/config/common.yaml | 3 +++ deployments/datahub/config/common.yaml | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml index f79609e74..404035ad3 100644 --- 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 index 2b9470581..31e028ae0 100644 --- 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: From 3d80607ee7b3fe83328c4ca4559baab8e324500c Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 19 Nov 2021 15:11:54 +0530 Subject: [PATCH 2/3] Temporarily install patched jupyterlab-link-share To use real time collaboration in JupyterLab, we need https://github.com/jupyterlab-contrib/jupyterlab-link-share/issues/10 to be fixed. https://github.com/jupyterlab-contrib/jupyterlab-link-share/pull/21 is a proposed solution, and I'm testing it out here to see if it works properly. Ref https://github.com/berkeley-dsep-infra/datahub/issues/3027 --- deployments/datahub/images/default/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deployments/datahub/images/default/Dockerfile b/deployments/datahub/images/default/Dockerfile index b488b6e99..113f2a0b9 100644 --- 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 +# https://github.com/jupyterlab-contrib/jupyterlab-link-share/pull/21 +RUN pip install git+https://github.com/yuvipanda/jupyterlab-link-share@7aaae98f3243a19e0755c966c2b018e3369e4611 + EXPOSE 8888 ENTRYPOINT ["tini", "--"] \ No newline at end of file From ae4cb2f45fbea7fc939f6c8c9ed95e0ed56fa09e Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 19 Nov 2021 19:49:50 +0530 Subject: [PATCH 3/3] Bump jupyterlab-link-share on datahub image For use with data100 hub primarily. Brings in https://github.com/jupyterlab-contrib/jupyterlab-link-share/pull/21 and https://github.com/jupyterlab-contrib/jupyterlab-link-share/pull/24 Ref https://github.com/berkeley-dsep-infra/datahub/issues/3027 --- deployments/datahub/images/default/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/datahub/images/default/Dockerfile b/deployments/datahub/images/default/Dockerfile index 113f2a0b9..c5f401d1a 100644 --- a/deployments/datahub/images/default/Dockerfile +++ b/deployments/datahub/images/default/Dockerfile @@ -256,8 +256,8 @@ ADD ipython_config.py ${IPYTHONDIR}/ipython_config.py RUN jupyter nbextension enable --py --sys-prefix qgrid # Temporarily install newer version of jupyterlab-link-share -# https://github.com/jupyterlab-contrib/jupyterlab-link-share/pull/21 -RUN pip install git+https://github.com/yuvipanda/jupyterlab-link-share@7aaae98f3243a19e0755c966c2b018e3369e4611 +# 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