From 3c916046a3b4baaa30e24cf3416983a979146b26 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Tue, 5 Nov 2024 15:09:18 +0100
Subject: [PATCH 1/2] Install jupyterhub-base instead of jupyterhub

---
 docs/using/recipe_code/jupyterhub_version.dockerfile | 2 +-
 images/base-notebook/Dockerfile                      | 7 ++++++-
 tests/docker-stacks-foundation/test_packages.py      | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/using/recipe_code/jupyterhub_version.dockerfile b/docs/using/recipe_code/jupyterhub_version.dockerfile
index 7fd530186a..22c9dfa197 100644
--- a/docs/using/recipe_code/jupyterhub_version.dockerfile
+++ b/docs/using/recipe_code/jupyterhub_version.dockerfile
@@ -1,6 +1,6 @@
 FROM quay.io/jupyter/base-notebook
 
-RUN mamba install --yes 'jupyterhub==4.0.1' && \
+RUN mamba install --yes 'jupyterhub-base==4.0.1' && \
     mamba clean --all -f -y && \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${NB_USER}"
diff --git a/images/base-notebook/Dockerfile b/images/base-notebook/Dockerfile
index dd068c8092..c63dc43006 100644
--- a/images/base-notebook/Dockerfile
+++ b/images/base-notebook/Dockerfile
@@ -39,9 +39,14 @@ USER ${NB_UID}
 # files across image layers when the permissions change
 WORKDIR /tmp
 RUN mamba install --yes \
-    'jupyterhub' \
+    'jupyterhub-base' \
     'jupyterlab' \
     'nbclassic' \
+    # nodejs has historically been installed indirectly as a dependency. When it
+    # was no longer getting installed indirectly, we started installing it
+    # explicitly to avoid introducing a breaking change for users building on
+    # top of these images.
+    'nodejs' \
     # 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
diff --git a/tests/docker-stacks-foundation/test_packages.py b/tests/docker-stacks-foundation/test_packages.py
index 0508ff1401..a87d51f0d6 100644
--- a/tests/docker-stacks-foundation/test_packages.py
+++ b/tests/docker-stacks-foundation/test_packages.py
@@ -74,8 +74,10 @@
     "grpcio-status",
     "grpcio",
     "hdf5",
+    "jupyterhub-base",
     "jupyterlab-git",
     "mamba[version='<2.0.0']",
+    "nodejs",
     "notebook[version='>",
     "openssl",
     "pandas[version='>",

From b73988373ef2146834f1cf7d605a208b5a01d5fc Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
Date: Wed, 6 Nov 2024 15:02:22 +0000
Subject: [PATCH 2/2] Update images/base-notebook/Dockerfile

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

diff --git a/images/base-notebook/Dockerfile b/images/base-notebook/Dockerfile
index c63dc43006..261cf3e65b 100644
--- a/images/base-notebook/Dockerfile
+++ b/images/base-notebook/Dockerfile
@@ -42,10 +42,11 @@ RUN mamba install --yes \
     'jupyterhub-base' \
     'jupyterlab' \
     'nbclassic' \
-    # nodejs has historically been installed indirectly as a dependency. When it
-    # was no longer getting installed indirectly, we started installing it
-    # explicitly to avoid introducing a breaking change for users building on
-    # top of these images.
+    # nodejs has historically been installed indirectly as a dependency.
+    # When it was no longer getting installed indirectly,
+    # we started installing it explicitly to avoid introducing a breaking change
+    # for users building on top of these images.
+    # See: https://github.com/jupyter/docker-stacks/pull/2171
     'nodejs' \
     # 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