diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ba70a95..0c1a910b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ This changelog only contains breaking and/or significant changes manually introduced to this repository (using Pull Requests). All image manifests can be found in [the wiki](https://github.com/jupyter/docker-stacks/wiki). +## 2024-11-08 + +Affected: all images except `docker-stacks-foundation`. + +- **Breaking:** `base-notebook`: stop installing `nodejs` from `conda-forge` ([#2172](https://github.com/jupyter/docker-stacks/pull/2172)). + + Reason: It isn't a direct dependency on anything in the images any more, and increased the image size with ~150MB. + ## 2024-11-06 Affected: all images except `docker-stacks-foundation`. diff --git a/docs/using/recipe_code/jupyterhub_version.dockerfile b/docs/using/recipe_code/jupyterhub_version.dockerfile index 22c9dfa1..bc6b2c11 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-base==4.0.1' && \ +RUN mamba install --yes 'jupyterhub-singleuser==4.0.1' && \ mamba clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" diff --git a/docs/using/selecting.md b/docs/using/selecting.md index c21a1036..d02e1624 100644 --- a/docs/using/selecting.md +++ b/docs/using/selecting.md @@ -54,9 +54,7 @@ It contains: - Everything in `jupyter/docker-stacks-foundation` - Minimally functional Server (e.g., no LaTeX support for saving notebooks as PDFs) -- `notebook`, `jupyterhub-base`, and `jupyterlab` packages - Note: we're also installing `nodejs` as it has historically been installed indirectly as a dependency of `jupyterhub` package, which was used before. - See more at: +- `notebook`, `jupyterhub-singleuser`, and `jupyterlab` packages - A `start-notebook.py` script as the default command - A `start-singleuser.py` script useful for launching containers in JupyterHub - Options for a self-signed HTTPS certificate diff --git a/images/base-notebook/Dockerfile b/images/base-notebook/Dockerfile index 261cf3e6..84014f7c 100644 --- a/images/base-notebook/Dockerfile +++ b/images/base-notebook/Dockerfile @@ -39,15 +39,9 @@ USER ${NB_UID} # files across image layers when the permissions change WORKDIR /tmp RUN mamba install --yes \ - 'jupyterhub-base' \ + 'jupyterhub-singleuser' \ '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. - # 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` (=7.2.2' && \ jupyter server --generate-config && \ mamba clean --all -f -y && \ - npm cache clean --force && \ jupyter lab clean && \ rm -rf "/home/${NB_USER}/.cache/yarn" && \ fix-permissions "${CONDA_DIR}" && \ diff --git a/tests/base-notebook/test_npm_package_manager.py b/tests/base-notebook/test_npm_package_manager.py deleted file mode 100644 index 14f50957..00000000 --- a/tests/base-notebook/test_npm_package_manager.py +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) Jupyter Development Team. -# Distributed under the terms of the Modified BSD License. -from tests.conftest import TrackedContainer -from tests.run_command import run_command - - -def test_npm_package_manager(container: TrackedContainer) -> None: - """Test that npm is installed and runs.""" - run_command(container, "npm --version") diff --git a/tests/docker-stacks-foundation/test_packages.py b/tests/docker-stacks-foundation/test_packages.py index a87d51f0..87c3f4bc 100644 --- a/tests/docker-stacks-foundation/test_packages.py +++ b/tests/docker-stacks-foundation/test_packages.py @@ -74,10 +74,9 @@ EXCLUDED_PACKAGES = [ "grpcio-status", "grpcio", "hdf5", - "jupyterhub-base", + "jupyterhub-singleuser", "jupyterlab-git", "mamba[version='<2.0.0']", - "nodejs", "notebook[version='>", "openssl", "pandas[version='>",