From c35da1b1f8513d1e8e4bd6a92cce2ed39c327d88 Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@gmail.com>
Date: Mon, 4 Nov 2024 13:56:05 +0000
Subject: [PATCH 1/2] [TMP] Pin min notebook version

---
 images/base-notebook/Dockerfile                 | 2 +-
 tests/docker-stacks-foundation/test_packages.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/images/base-notebook/Dockerfile b/images/base-notebook/Dockerfile
index 0cde5b5d9..4e672241f 100644
--- a/images/base-notebook/Dockerfile
+++ b/images/base-notebook/Dockerfile
@@ -42,7 +42,7 @@ RUN mamba install --yes \
     'jupyterhub' \
     'jupyterlab' \
     'nbclassic' \
-    'notebook' && \
+    'notebook>=7.2.2' && \
     jupyter server --generate-config && \
     mamba clean --all -f -y && \
     npm cache clean --force && \
diff --git a/tests/docker-stacks-foundation/test_packages.py b/tests/docker-stacks-foundation/test_packages.py
index 9b70be38c..0508ff140 100644
--- a/tests/docker-stacks-foundation/test_packages.py
+++ b/tests/docker-stacks-foundation/test_packages.py
@@ -76,6 +76,7 @@
     "hdf5",
     "jupyterlab-git",
     "mamba[version='<2.0.0']",
+    "notebook[version='>",
     "openssl",
     "pandas[version='>",
     "protobuf",

From 43392208dea1ec6f94c0aeae74202699abdfc6ff Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
Date: Mon, 4 Nov 2024 14:50:46 +0000
Subject: [PATCH 2/2] Update Dockerfile

---
 images/base-notebook/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/images/base-notebook/Dockerfile b/images/base-notebook/Dockerfile
index 4e672241f..dd068c809 100644
--- a/images/base-notebook/Dockerfile
+++ b/images/base-notebook/Dockerfile
@@ -42,6 +42,10 @@ RUN mamba install --yes \
     'jupyterhub' \
     'jupyterlab' \
     'nbclassic' \
+    # Sometimes, when the new version of `jupyterlab` is released, latest `notebook` might not support it for some time
+    # Old versions of `notebook` (<v7) didn't have a restriction on the `jupyterlab` version, and old `notebook` is getting installed
+    # That's why we have to pin the minimum notebook version
+    # More info: https://github.com/jupyter/docker-stacks/pull/2167
     'notebook>=7.2.2' && \
     jupyter server --generate-config && \
     mamba clean --all -f -y && \