Remove collab

ucsd-ets · Jul 16, 2024 · 769707f · 769707f
1 parent be8fd42
commit 769707f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/images/datascience-notebook/Dockerfile b/images/datascience-notebook/Dockerfile
@@ -74,7 +74,8 @@ RUN mamba install -c conda-forge pillow typing-extensions tzlocal appdirs gputil
 # Install jupyterlab+extensions
 RUN mamba install -c conda-forge jupyterhub=$JUPYTERHUB_VERSION jupyter_server=$JUPYTERSERVER_VERSION && \
     mamba install -c conda-forge jupyterlab=$JUPYTERLAB_VERSION notebook=$NOTEBOOK_VERSION nbclassic=$NBCLASSIC_VERSION && \
-    mamba install -c conda-forge jupyterlab_rise jupyter_server_terminals jupyter-collaboration && \
+    # (TODO: Re-enable collab once RTC is fixed) mamba install -c conda-forge jupyterlab_rise jupyter_server_terminals jupyter-collaboration && \
+    mamba install -c conda-forge jupyterlab_rise jupyter_server_terminals && \
     mamba install -c conda-forge jupyterlab-github jupyterlab-latex jupyterlab-git jupyterlab-fasta jupyterlab-geojson && \
     mamba install -c conda-forge nbconvert=$NBCONVERT_VERSION nbgrader=$NBGRADER_VERSION && \
     fix-permissions $CONDA_DIR && \

diff --git a/images/datascience-notebook/scripts/jupyter_server_config.py b/images/datascience-notebook/scripts/jupyter_server_config.py
@@ -11,10 +11,9 @@
 c = get_config()  # noqa: F821
 c.ServerApp.ip = "0.0.0.0"
 c.ServerApp.open_browser = False
-c.ServerApp.tornado_settings = {'headers': {'Content-Security-Policy': "frame-ancestors *;"}}
 
-# TEMP: Disable RTC until bugs fixed with URL modification
-c.YDocExtension.disable_rtc = True
+# Fix iframes (formgrader) as of jhub 4.1.0
+c.ServerApp.tornado_settings = {'headers': {'Content-Security-Policy': "frame-ancestors *;"}}
 
 # to output both image/svg+xml and application/pdf plot formats in the notebook file
 c.InlineBackend.figure_formats = {"png", "jpeg", "svg", "pdf"}