From c8a5e741be1d0cf1d66b965130a64bea0ff9a3a6 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Thu, 6 Jul 2023 15:19:17 +0100 Subject: [PATCH 01/17] Upgrade base image for d4science --- d4science-base/Dockerfile | 58 ++---------------------------- single-user-d4science/Dockerfile | 4 +-- single-user-r-d4science/Dockerfile | 6 ++-- single-user-sobigdata/Dockerfile | 34 ++++++++++-------- 4 files changed, 27 insertions(+), 75 deletions(-) diff --git a/d4science-base/Dockerfile b/d4science-base/Dockerfile index 22fba955..6e5f0cc6 100644 --- a/d4science-base/Dockerfile +++ b/d4science-base/Dockerfile @@ -1,7 +1,6 @@ -# 59c973d16bca has python3.8.8 -# Using that to ensure the image remains the same -FROM jupyter/datascience-notebook:59c973d16bca -ARG julia_version="1.7.1" +# 4d70cf8da953 has python3.10.11 +# Using that to ensure the image remains the same +FROM jupyter/datascience-notebook:4d70cf8da953 USER root @@ -17,38 +16,6 @@ RUN apt-get update \ RUN curl https://raw.githubusercontent.com/kadwanev/retry/master/retry \ -o /usr/local/bin/retry && chmod +x /usr/local/bin/retry -# Julia dependencies -# install Julia packages in /opt/julia instead of ${HOME} -ENV JULIA_DEPOT_PATH=/opt/julia \ - JULIA_PKGDIR=/opt/julia \ - JULIA_VERSION="${julia_version}" - -WORKDIR /tmp - -# hadolint ignore=SC2046 -RUN set -x && \ - julia_arch=$(uname -m) && \ - julia_short_arch="${julia_arch}" && \ - if [ "${julia_short_arch}" == "x86_64" ]; then \ - julia_short_arch="x64"; \ - fi; \ - julia_installer="julia-${JULIA_VERSION}-linux-${julia_arch}.tar.gz" && \ - julia_major_minor=$(echo "${JULIA_VERSION}" | cut -d. -f 1,2) && \ - mkdir "/opt/julia-${JULIA_VERSION}" && \ - wget -q "https://julialang-s3.julialang.org/bin/linux/${julia_short_arch}/${julia_major_minor}/${julia_installer}" && \ - tar xzf "${julia_installer}" -C "/opt/julia-${JULIA_VERSION}" --strip-components=1 && \ - rm "${julia_installer}" && \ - ln -fs /opt/julia-${JULIA_VERSION}/bin/julia /usr/local/bin/julia - -# Show Julia where conda libraries are \ -RUN rm -rf /etc/julia && mkdir /etc/julia && \ - echo "push!(Libdl.DL_LOAD_PATH, \"${CONDA_DIR}/lib\")" >> /etc/julia/juliarc.jl && \ - # Create JULIA_PKGDIR \ - rm -rf "${JULIA_PKGDIR}" && \ - mkdir "${JULIA_PKGDIR}" && \ - chown "${NB_USER}" "${JULIA_PKGDIR}" && \ - fix-permissions "${JULIA_PKGDIR}" - USER $NB_UID # install mamba which goes way faster than conda @@ -66,30 +33,11 @@ RUN conda install mamba -y --quiet -c conda-forge \ xarray \ cartopy \ ipyleaflet \ - jupyterlab==3.1.4 \ - notebook==6.4.1 \ - nbclassic==0.2.8 \ - jupyter-server-proxy==3.2.2 \ nbgitpuller \ - jinja2==3.0.3 \ && conda clean --all RUN pip install --no-cache-dir shortid -# Add Julia packages. -# Install IJulia as jovyan and then move the kernelspec out -# to the system share location. Avoids problems with runtime UID change not -# taking effect properly on the .local folder in the jovyan home dir. -RUN /usr/local/bin/julia -e 'import Pkg; Pkg.update()' && \ - /usr/local/bin/julia -e 'import Pkg; Pkg.add("HDF5")' && \ - /usr/local/bin/julia -e 'using Pkg; pkg"add IJulia"; pkg"precompile"' && \ - # move kernelspec out of home - mv "${HOME}/.local/share/jupyter/kernels/julia"* "${CONDA_DIR}/share/jupyter/kernels/" && \ - rm -rf "${CONDA_DIR}/share/jupyter/kernels/julia-1.6" && \ - chmod -R go+rx "${CONDA_DIR}/share/jupyter" && \ - rm -rf "${HOME}/.local" && \ - fix-permissions "${JULIA_PKGDIR}" "${CONDA_DIR}/share/jupyter" - WORKDIR "${HOME}" RUN jupyter labextension install @jupyter-widgets/jupyterlab-manager jupyter-leaflet diff --git a/single-user-d4science/Dockerfile b/single-user-d4science/Dockerfile index 20e66eea..7dfb160e 100644 --- a/single-user-d4science/Dockerfile +++ b/single-user-d4science/Dockerfile @@ -34,11 +34,11 @@ RUN mamba install -y --quiet \ nb_conda_kernels \ nb_conda \ pyophidia \ - && conda clean -tipsy + && conda clean -tipy RUN conda create --quiet --yes -n java8 \ && mamba install -n java8 --yes openjdk=8 \ - && conda clean -tipsy + && conda clean -tipy ENV CPLUS_INCLUDE_PATH=/usr/include/gdal ENV C_INCLUDE_PATH=/usr/include/gdal diff --git a/single-user-r-d4science/Dockerfile b/single-user-r-d4science/Dockerfile index 11d9b88d..4a385b4a 100644 --- a/single-user-r-d4science/Dockerfile +++ b/single-user-r-d4science/Dockerfile @@ -7,7 +7,7 @@ RUN mamba install -y --quiet \ r-geojsonio \ r-rlang \ r-rcpp \ - && conda clean -tipsy + && conda clean -tipy RUN mamba install -y --quiet \ r-vctrs \ @@ -19,7 +19,7 @@ RUN mamba install -y --quiet \ r-dbi \ r-cpp11 \ r-bh \ - && conda clean -tipsy + && conda clean -tipy RUN mamba install -y --quiet \ r-tibble \ @@ -30,7 +30,7 @@ RUN mamba install -y --quiet \ r-rgdal \ r-pastecs \ r-factominer \ - && conda clean -tipsy + && conda clean -tipy RUN Rscript -e "remotes::install_github('eblondel/geoflow', dependencies = c('Depends', 'Imports'))" diff --git a/single-user-sobigdata/Dockerfile b/single-user-sobigdata/Dockerfile index 1a564f31..491f93c6 100644 --- a/single-user-sobigdata/Dockerfile +++ b/single-user-sobigdata/Dockerfile @@ -1,11 +1,11 @@ -# _____ ____ _ _____ _ -# / ____| | _ \(_) | __ \ | | _ _ -# | (___ ___ | |_) |_ __ _| | | | __ _| |_ __ _ _| |_ _| |_ +# _____ ____ _ _____ _ +# / ____| | _ \(_) | __ \ | | _ _ +# | (___ ___ | |_) |_ __ _| | | | __ _| |_ __ _ _| |_ _| |_ # \___ \ / _ \| _ <| |/ _` | | | |/ _` | __/ _` |_ _|_ _| -# ____) | (_) | |_) | | (_| | |__| | (_| | || (_| | |_| |_| -# |_____/ \___/|____/|_|\__, |_____/ \__,_|\__\__,_| -# __/ | -# |___/ +# ____) | (_) | |_) | | (_| | |__| | (_| | || (_| | |_| |_| +# |_____/ \___/|____/|_|\__, |_____/ \__,_|\__\__,_| +# __/ | +# |___/ ARG BASE_IMAGE=eginotebooks/d4science-base:latest # hadolint ignore=DL3006 @@ -43,7 +43,7 @@ RUN mamba install -y --quiet \ contextily \ nb_conda_kernels \ nb_conda \ - && conda clean -tipsy + && conda clean -tipy # Pinned networkx to 2.6.3 as 2.7 makes networksns fail RUN pip install --no-cache-dir \ @@ -85,8 +85,6 @@ RUN pip install --no-cache-dir \ # ------------------------------- RUN mamba install -y --quiet \ pyspark \ - pyfim \ - pyclustering \ transformers \ rtree \ geopandas \ @@ -100,10 +98,15 @@ RUN mamba install -y --quiet \ openjdk=8 \ && conda clean --all -RUN mamba install -y pytorch==1.6.0 torchtext torchvision -c pytorch \ - && conda clean --all +RUN pip install --no-cache-dir \ + torch \ + torchvision \ + torchaudio \ + --index-url https://download.pytorch.org/whl/cpu RUN pip install --no-cache-dir \ + pyfim \ + pyclustering \ import_ipynb \ opencv-python \ simpletransformers \ @@ -115,6 +118,7 @@ RUN pip install --no-cache-dir \ dynetx==0.3.2 # ------------------------------- - -#RUN jupyter labextension install jupyterlab-topbar-extension jupyterlab-system-monitor -#RUN jupyter labextension disable @jupyterlab/filebrowser-extension:share-file \ No newline at end of file +# JupyterLab extensions +# ------------------------------- +RUN pip install --no-cache-dir jupyterlab-topbar +RUN jupyter labextension disable @jupyterlab/filebrowser-extension:share-file From ed0046492dd7f6aa6525ede5af250863c93cfa33 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Thu, 6 Jul 2023 15:36:00 +0100 Subject: [PATCH 02/17] Use another tag --- d4science-base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/d4science-base/Dockerfile b/d4science-base/Dockerfile index 6e5f0cc6..f13f5e20 100644 --- a/d4science-base/Dockerfile +++ b/d4science-base/Dockerfile @@ -1,6 +1,6 @@ # 4d70cf8da953 has python3.10.11 # Using that to ensure the image remains the same -FROM jupyter/datascience-notebook:4d70cf8da953 +FROM jupyter/datascience-notebook:python-3.10.11 USER root From 3f72f37a533756c88a093414f0394ded5033a64b Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Thu, 6 Jul 2023 15:36:39 +0100 Subject: [PATCH 03/17] Do not install mamba --- d4science-base/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/d4science-base/Dockerfile b/d4science-base/Dockerfile index f13f5e20..a6bb6c8e 100644 --- a/d4science-base/Dockerfile +++ b/d4science-base/Dockerfile @@ -18,9 +18,7 @@ RUN curl https://raw.githubusercontent.com/kadwanev/retry/master/retry \ USER $NB_UID -# install mamba which goes way faster than conda -RUN conda install mamba -y --quiet -c conda-forge \ - && mamba install -y -q \ +RUN mamba install -y -q \ r-plotly \ r-gdata \ rdflib \ From 93dafa9d4726427d07ae223ce0e78f3430a83bf1 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Fri, 7 Jul 2023 09:41:53 +0100 Subject: [PATCH 04/17] Fix versions --- single-user-d4science/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/single-user-d4science/Dockerfile b/single-user-d4science/Dockerfile index 7dfb160e..1c662b00 100644 --- a/single-user-d4science/Dockerfile +++ b/single-user-d4science/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=eginotebooks/base:latest +ARG BASE_IMAGE=eginotebooks/d4science-base:latest # hadolint ignore=DL3006 FROM $BASE_IMAGE @@ -10,7 +10,7 @@ RUN apt-get update \ cdo \ gdal-bin \ cmake \ - libgdal-dev=3.0.4+dfsg-1build3 \ + libgdal-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -25,7 +25,7 @@ RUN mamba install -y --quiet \ netcdf4 \ aiohttp \ graph-tool \ - scikit-learn==0.22.1 \ + scikit-learn \ scikit-mobility \ dask-jobqueue \ fs \ @@ -74,7 +74,7 @@ RUN pip install --no-cache-dir \ holoviews \ networkx==2.6.3 \ networksns \ - GDAL==3.0.4 #need to match the version of gdal installed + GDAL==$(gdal --version) #need to match the version of gdal installed # Julia Updates and packages installations # See https://support.d4science.org/issues/22065 From b8baf480325e0829d97d4ef89d8796ba5eae354b Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Fri, 7 Jul 2023 10:53:28 +0100 Subject: [PATCH 05/17] Fix lab extensions --- single-user-3d-d4science/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/single-user-3d-d4science/Dockerfile b/single-user-3d-d4science/Dockerfile index 722ed401..1e62375d 100644 --- a/single-user-3d-d4science/Dockerfile +++ b/single-user-3d-d4science/Dockerfile @@ -34,6 +34,9 @@ RUN pip install --no-cache-dir \ Scipy # ------------------------------- - -RUN jupyter labextension install jupyterlab-topbar-extension jupyterlab-system-monitor -RUN jupyter labextension disable @jupyterlab/filebrowser-extension:share-file \ No newline at end of file +# Jupyter lab extensions +# ------------------------------- +RUN pip install --no-cache-dir \ + jupyterlab-topbar \ + jupyterlab-system-monitor +RUN jupyter labextension disable @jupyterlab/filebrowser-extension:share-file From e4022e30d78cf91b98a1af3f9cea945655481f9b Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Fri, 7 Jul 2023 10:54:33 +0100 Subject: [PATCH 06/17] Fix lab extensions --- single-user-scientometrics-d4science/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/single-user-scientometrics-d4science/Dockerfile b/single-user-scientometrics-d4science/Dockerfile index d8211f9e..c4bf1dbf 100644 --- a/single-user-scientometrics-d4science/Dockerfile +++ b/single-user-scientometrics-d4science/Dockerfile @@ -235,6 +235,9 @@ RUN pip install --no-cache-dir \ zstandard==0.19.0 # ------------------------------- - -RUN jupyter labextension install jupyterlab-topbar-extension jupyterlab-system-monitor -RUN jupyter labextension disable @jupyterlab/filebrowser-extension:share-file \ No newline at end of file +# Jupyter lab extensions +# ------------------------------- +RUN pip install --no-cache-dir \ + jupyterlab-topbar \ + jupyterlab-system-monitor +RUN jupyter labextension disable @jupyterlab/filebrowser-extension:share-file From e7f477de9b0ca4b2e6dc3f043c291ac1d86f2629 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Fri, 7 Jul 2023 11:28:05 +0100 Subject: [PATCH 07/17] Fix lab extensions --- single-user-sobigdata-lipari23/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/single-user-sobigdata-lipari23/Dockerfile b/single-user-sobigdata-lipari23/Dockerfile index 52b58ce8..0ed1045e 100644 --- a/single-user-sobigdata-lipari23/Dockerfile +++ b/single-user-sobigdata-lipari23/Dockerfile @@ -47,7 +47,11 @@ RUN pip install --no-cache-dir \ --index-url https://download.pytorch.org/whl/cpu RUN mamba install -y protobuf==4.23.3 -# ------------------------------- -RUN jupyter labextension install jupyterlab-topbar-extension jupyterlab-system-monitor +# ------------------------------- +# Jupyter lab extensions +# ------------------------------- +RUN pip install --no-cache-dir \ + jupyterlab-topbar \ + jupyterlab-system-monitor RUN jupyter labextension disable @jupyterlab/filebrowser-extension:share-file From f82c435b82f846b57180f4fc5cc24a051e7a1846 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Fri, 7 Jul 2023 12:26:10 +0100 Subject: [PATCH 08/17] Bring back all builds --- .github/workflows/d4science-images.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/d4science-images.yml b/.github/workflows/d4science-images.yml index cc7ead4b..efbf5951 100644 --- a/.github/workflows/d4science-images.yml +++ b/.github/workflows/d4science-images.yml @@ -55,13 +55,13 @@ jobs: strategy: matrix: image: - #- single-user-d4science - # - single-user-seaclearly - #- single-user-xaiss - #- single-user-sobigdata - #- single-user-r-d4science - #- single-user-3d-d4science - #- single-user-scientometrics-d4science + - single-user-d4science + - single-user-seaclearly + - single-user-xaiss + - single-user-sobigdata + - single-user-r-d4science + - single-user-3d-d4science + - single-user-scientometrics-d4science - single-user-sobigdata-lipari23 steps: From f74c624adbdc5ee4c08e228ce0d13934bb57a0f0 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Fri, 7 Jul 2023 13:02:02 +0100 Subject: [PATCH 09/17] Fix the build --- .github/workflows/d4science-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/d4science-images.yml b/.github/workflows/d4science-images.yml index efbf5951..ca152c16 100644 --- a/.github/workflows/d4science-images.yml +++ b/.github/workflows/d4science-images.yml @@ -56,7 +56,7 @@ jobs: matrix: image: - single-user-d4science - - single-user-seaclearly + - single-user-seaclearly - single-user-xaiss - single-user-sobigdata - single-user-r-d4science From 4564ad2ec775675ac39a688778ff622da3278db6 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Fri, 7 Jul 2023 13:06:13 +0100 Subject: [PATCH 10/17] Keep this commented --- .github/workflows/d4science-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/d4science-images.yml b/.github/workflows/d4science-images.yml index ca152c16..b28a716b 100644 --- a/.github/workflows/d4science-images.yml +++ b/.github/workflows/d4science-images.yml @@ -56,7 +56,7 @@ jobs: matrix: image: - single-user-d4science - - single-user-seaclearly + # - single-user-seaclearly - single-user-xaiss - single-user-sobigdata - single-user-r-d4science From bbdcb5f7f14ff61e73f8991a0386f7b34ceb5465 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Fri, 7 Jul 2023 13:47:14 +0100 Subject: [PATCH 11/17] Fix GDAL version check --- single-user-d4science/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/single-user-d4science/Dockerfile b/single-user-d4science/Dockerfile index 1c662b00..da3231aa 100644 --- a/single-user-d4science/Dockerfile +++ b/single-user-d4science/Dockerfile @@ -74,7 +74,7 @@ RUN pip install --no-cache-dir \ holoviews \ networkx==2.6.3 \ networksns \ - GDAL==$(gdal --version) #need to match the version of gdal installed + GDAL==$(gdal-config --version) #need to match the version of gdal installed # Julia Updates and packages installations # See https://support.d4science.org/issues/22065 From 0e8edaed23519ff1d9da43336218a1cb4ce252fe Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Fri, 7 Jul 2023 15:49:18 +0100 Subject: [PATCH 12/17] Do not build this one, takes too much space --- .github/workflows/d4science-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/d4science-images.yml b/.github/workflows/d4science-images.yml index b28a716b..b608005c 100644 --- a/.github/workflows/d4science-images.yml +++ b/.github/workflows/d4science-images.yml @@ -57,7 +57,7 @@ jobs: image: - single-user-d4science # - single-user-seaclearly - - single-user-xaiss + # - single-user-xaiss - single-user-sobigdata - single-user-r-d4science - single-user-3d-d4science From 251fae409ee2cc9fe2c5cd1adbc63024ccc9ebad Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Fri, 7 Jul 2023 15:49:32 +0100 Subject: [PATCH 13/17] Update julia --- single-user-d4science/tests/julia.ipynb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/single-user-d4science/tests/julia.ipynb b/single-user-d4science/tests/julia.ipynb index 2a78753d..cf4d5d17 100644 --- a/single-user-d4science/tests/julia.ipynb +++ b/single-user-d4science/tests/julia.ipynb @@ -12,15 +12,15 @@ ], "metadata": { "kernelspec": { - "display_name": "Julia 1.7.1", + "display_name": "Julia 1.8.1", "language": "julia", - "name": "julia-1.7" + "name": "julia-1.8" }, "language_info": { "file_extension": ".jl", "mimetype": "application/julia", "name": "julia", - "version": "1.7.1" + "version": "1.8.1" } }, "nbformat": 4, From bb3d7fcf584110efeab4b8073343716644eb9f8b Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Mon, 10 Jul 2023 07:16:14 +0100 Subject: [PATCH 14/17] Get version hash again --- d4science-base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/d4science-base/Dockerfile b/d4science-base/Dockerfile index a6bb6c8e..cc13f35d 100644 --- a/d4science-base/Dockerfile +++ b/d4science-base/Dockerfile @@ -1,6 +1,6 @@ # 4d70cf8da953 has python3.10.11 # Using that to ensure the image remains the same -FROM jupyter/datascience-notebook:python-3.10.11 +FROM jupyter/datascience-notebook:4d70cf8da953 USER root From 6877b75348c07d332c02c4a9ad4e9a7a52966c20 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Mon, 10 Jul 2023 07:20:58 +0100 Subject: [PATCH 15/17] Avoid build failure --- single-user-r-d4science/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/single-user-r-d4science/Dockerfile b/single-user-r-d4science/Dockerfile index 4a385b4a..a14d065a 100644 --- a/single-user-r-d4science/Dockerfile +++ b/single-user-r-d4science/Dockerfile @@ -38,5 +38,6 @@ RUN Rscript -e "install.packages(c('geometa','ows4R','geonapi','geosapi','raste RUN pip install --no-cache-dir \ import_ipynb \ - nbresuse \ - git+https://github.com/andrea-manzi/mbtr.git + nbresuse + # leave this out for now + # git+https://github.com/andrea-manzi/mbtr.git From bd62b16dfec7b2bdb3be41619c8333925feb1e54 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Mon, 10 Jul 2023 08:06:12 +0100 Subject: [PATCH 16/17] Extensions --- single-user-d4science/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/single-user-d4science/Dockerfile b/single-user-d4science/Dockerfile index da3231aa..1b1a45bc 100644 --- a/single-user-d4science/Dockerfile +++ b/single-user-d4science/Dockerfile @@ -84,5 +84,10 @@ RUN julia --eval 'using Pkg; Pkg.pin("IJulia")' \ && julia --eval 'using Pkg; Pkg.add(url="https://github.com/gher-ulg/DIVAndNN.jl")' \ && julia --eval 'using Pkg; Pkg.add(["JSON", "PyCall", "PyPlot", "DIVAnd", "Glob", "DataStructures", "NCDatasets"])' -RUN jupyter labextension install jupyterlab-topbar-extension jupyterlab-system-monitor +# ------------------------------- +# JupyterLab extensions +# ------------------------------- +RUN pip install --no-cache-dir \ + jupyterlab-topbar \ + jupyterlab-system-monitor RUN jupyter labextension disable @jupyterlab/filebrowser-extension:share-file From 5cb1a9fb537fec2810f42634c3a59c0cfae1c5e1 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Mon, 10 Jul 2023 09:58:58 +0100 Subject: [PATCH 17/17] Use the original source --- single-user-r-d4science/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/single-user-r-d4science/Dockerfile b/single-user-r-d4science/Dockerfile index a14d065a..09a3d208 100644 --- a/single-user-r-d4science/Dockerfile +++ b/single-user-r-d4science/Dockerfile @@ -38,6 +38,5 @@ RUN Rscript -e "install.packages(c('geometa','ows4R','geonapi','geosapi','raste RUN pip install --no-cache-dir \ import_ipynb \ - nbresuse - # leave this out for now - # git+https://github.com/andrea-manzi/mbtr.git + nbresuse \ + git+https://github.com/supsi-dacd-isaac/mbtr.git