From 54719cd2f6b7894007c5c256919298c6d52108b7 Mon Sep 17 00:00:00 2001 From: Pauline <4224001+paulineribeyre@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:51:16 -0600 Subject: [PATCH] fix --- jupyter-covid19/Dockerfile | 9 ++++++++- jupyter-restricted-download/Dockerfile | 4 ---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/jupyter-covid19/Dockerfile b/jupyter-covid19/Dockerfile index 235cdee8..149e7950 100644 --- a/jupyter-covid19/Dockerfile +++ b/jupyter-covid19/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/cdis/jupyter-notebook:restricted-download-jupyter-covid19-restrict-download +FROM quay.io/cdis/jupyter-notebook:restricted-download-master USER $NB_USER WORKDIR /home/$NB_USER @@ -97,3 +97,10 @@ RUN touch /home/$NB_USER/covid19-notebook/peregrine.py # premade notebooks dependencies RUN pip install -U -r /home/$NB_USER/covid19-notebook/requirements.txt + +# The image can't function (see error below) with `jsonschema` version 3.2.0. Some dependencies are +# preventing `jsonschema` from being upgraded to a more recent version. Updating it here as a quick fix. +# File "/usr/local/lib/python3.9/dist-packages/jupyter_events/validators.py", line 44, in +# JUPYTER_EVENTS_SCHEMA_VALIDATOR = Draft7Validator( +# TypeError: __init__() got an unexpected keyword argument 'registry' +RUN pip install jsonschema==4.20.0 --upgrade diff --git a/jupyter-restricted-download/Dockerfile b/jupyter-restricted-download/Dockerfile index 3987055d..0997368b 100644 --- a/jupyter-restricted-download/Dockerfile +++ b/jupyter-restricted-download/Dockerfile @@ -85,10 +85,6 @@ COPY resources/custom.js /home/$NB_USER/.jupyter/custom/ COPY resources/jupyter_notebook_config.py /home/$NB_USER/.jupyter/tmp.py RUN cat /home/$NB_USER/.jupyter/tmp.py >> /home/$NB_USER/.jupyter/jupyter_notebook_config.py && rm /home/$NB_USER/.jupyter/tmp.py -# Putting this all the way down here, to make sure its the last thing done -# The image can't function with jsonschema version 3.2.0, which some dependency installs -RUN pip install jsonschema==4.20.0 --upgrade - USER $NB_USER # Set the default command to start JupyterLab