Try not to change base

d4science-base/Dockerfile

@@ -1,4 +1,7 @@
-# 7e1a19a8427f has python3.11
+# 4d70cf8da953 has python3.10.11
+# Using that to ensure the image remains the same
+FROM jupyter/datascience-notebook:4d70cf8da953
+
 # Using that to ensure the image remains the same
 FROM jupyter/datascience-notebook:7e1a19a8427f
 

single-user-r-d4science/Dockerfile

@@ -1,6 +1,42 @@
-ARG BASE_IMAGE=eginotebooks/base:latest
-# hadolint ignore=DL3006
-FROM $BASE_IMAGE
+FROM jupyter/datascience-notebook:7e1a19a8427f
+
+USER root
+
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        less \
+        graphviz \
+        vim \
+        openssh-client \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl https://raw.githubusercontent.com/kadwanev/retry/master/retry \
+         -o /usr/local/bin/retry && chmod +x /usr/local/bin/retry
+
+USER $NB_UID
+
+RUN mamba install -y -q \
+        r-plotly \
+        r-gdata \
+        rdflib \
+        prov \
+        graphviz \
+        pydot \
+        lxml \
+        geojson \
+        pydap \
+        xarray \
+        cartopy \
+        ipyleaflet \
+        nbgitpuller \
+    && conda clean --all
+
+RUN pip install --no-cache-dir shortid
+
+WORKDIR "${HOME}"
+
+RUN jupyter labextension install @jupyter-widgets/jupyterlab-manager jupyter-leaflet
 
 RUN mamba install -y --quiet \
         r-rpostgres \