Update datascience-notebook

Signed-off-by: Jacob Woffenden <jacob.woffenden@digital.justice.gov.uk>

.github/workflows/jupyter-lab-test-and-build.yml

@@ -54,7 +54,7 @@ jobs:
       matrix:
         flavour:
           - "allspark-notebook"
-          # - "datascience-notebook"
+          - "datascience-notebook"
           # - "oracle-datascience-notebook"
     steps:
       - name: Checkout

allspark-notebook/Dockerfile

@@ -3,9 +3,7 @@ FROM quay.io/jupyter/all-spark-notebook@sha256:a5bf7857fdfb439c21152f58f54b7c1fc
 
 LABEL org.opencontainers.image.vendor="Ministry of Justice" \
       org.opencontainers.image.authors="Analytical Platform" \
-      org.opencontainers.image.title="Jupyter All Spark" \
-      org.opencontainers.image.description="Extended version of Microsoft's image" \
-      org.opencontainers.image.url="https://github.com/ministryofjustice/data-platform/tree/main/containers/actions-runner" \
+      org.opencontainers.image.title="Jupyter All Spark Notebook" \
       maintainer="analytics-platform-tech@digital.justice.gov.uk"
 
 ENV PATH="${PATH}:${HOME}/.local/bin" \
@@ -20,9 +18,8 @@ RUN apt-get update --yes \
          libspatialindex-dev \
          openssh-client \
     && apt-get clean --yes \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN pip install --no-cache-dir --upgrade \
+    && rm -rf /var/lib/apt/lists/* \
+    && pip install --no-cache-dir --upgrade \
       pip \
       boto3 \
       nbstripout \

datascience-notebook/Dockerfile

@@ -1,36 +1,34 @@
-FROM jupyter/datascience-notebook:lab-3.1.11
+# lab-4.0.11
+FROM quay.io/jupyter/datascience-notebook@sha256:76148e403aa44017f59b1dd0861d91daae800c7f86e9f39138b9d2703b885082
 
-LABEL maintainer=analytics-platform-tech@digital.justice.gov.uk
+LABEL org.opencontainers.image.vendor="Ministry of Justice" \
+      org.opencontainers.image.authors="Analytical Platform" \
+      org.opencontainers.image.title="Jupyter Datascience Notebook" \
+      maintainer="analytics-platform-tech@digital.justice.gov.uk"
 
-ENV PATH=$PATH:$HOME/.local/bin
-
-# Home directory contents is already owned by UID 1000
-ENV CHOWN_HOME=no
+ENV PATH="${PATH}:${HOME}/.local/bin" \
+    CHOWN_HOME="no"
 
 USER root
 
-RUN apt-get update \
-  && apt-get install -y \
-  ca-certificates-java \
-  openjdk-8-jdk \
-  openssh-client \
-  software-properties-common \
-  gdal-bin \
-  libspatialindex-dev \
-  && rm -rf /var/lib/apt/lists/*
-
-RUN update-alternatives --set editor /bin/nano-tiny
-
-RUN pip install --upgrade \
-  boto3 \
-  black \
-  nbstripout \
-  rtree \
-  "s3fs<=0.4"
-
-RUN pip install --upgrade jupyterlab-git
-
-RUN conda install --yes \
-    'nbstripout' 
-
-RUN nbstripout --install --system
+RUN apt-get update --yes \
+    && apt-get install --yes \
+         ca-certificates-java \
+         openjdk-8-jdk \
+         openssh-client \
+         software-properties-common \
+         gdal-bin \
+         libspatialindex-dev \
+    && apt-get clean --yes \
+    && rm -rf /var/lib/apt/lists/* \
+    && pip install --no-cache-dir --upgrade \
+         boto3 \
+         black \
+         nbstripout \
+         rtree \
+         s3fs==2023.12.2 \
+         jupyterlab-git \
+    && conda install --yes \
+         nbstripout \
+    && nbstripout --install --system \
+    && update-alternatives --set editor /bin/nano-tiny

datascience-notebook/test/container-structure-test.yml

@@ -0,0 +1,46 @@
+---
+schemaVersion: 2.0.0
+
+containerRunOptions:
+  user: "jovyan"
+
+commandTests:
+  - name: "whoami"
+    command: "whoami"
+    expectedOutput: ["jovyan"]
+
+  - name: "user"
+    command: "id"
+    args: ["--user", "jovyan"]
+    expectedOutput: ["1000"]
+
+  - name: "groups"
+    command: "id"
+    args: ["--groups", "jovyan"]
+    expectedOutput: ["100"]
+
+  - name: "conda"
+    command: "conda"
+    args: ["info"]
+    expectedOutput: [".*active environment.*"]
+
+  - name: "juptyer-lab"
+    command: "jupyter-lab"
+    args: ["--version"]
+    expectedOutput: ["4.0.11"]
+
+  - name: "nano"
+    command: "nano"
+    args: ["--version"]
+    expectedOutput: ["GNU nano.*"]
+
+  - name: "pip"
+    command: "pip"
+    args: ["--version"]
+    expectedOutput: ["pip.*"]
+
+  - name: "install osmnx"
+    command: "pip"
+    args: ["install", "osmnx"]
+    exitCode: 0
+    expectedOutput: ["Successfully installed.*"]