diff --git a/CHANGELOG.md b/CHANGELOG.md index a27c14c8..f8e081ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ 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). +## 2025-03-23 + +Affected: `tensorflow-notebook`. + +- **Non-breaking:** `tensorflow-notebook`: Use mamba to install jupyter-server-proxy ([#2262](https://github.com/jupyter/docker-stacks/pull/2262)). + ## 2025-03-22 Affected: all images. diff --git a/images/tensorflow-notebook/Dockerfile b/images/tensorflow-notebook/Dockerfile index a433b2fa..974e0d6e 100644 --- a/images/tensorflow-notebook/Dockerfile +++ b/images/tensorflow-notebook/Dockerfile @@ -11,10 +11,15 @@ LABEL maintainer="Jupyter Project " # Fix: https://github.com/koalaman/shellcheck/wiki/SC3014 SHELL ["/bin/bash", "-o", "pipefail", "-c"] +RUN mamba install --yes \ + 'jupyter-server-proxy' && \ + mamba clean --all -f -y && \ + fix-permissions "${CONDA_DIR}" && \ + fix-permissions "/home/${NB_USER}" + # Install tensorflow with pip, on x86_64 tensorflow-cpu RUN [[ $(uname -m) = x86_64 ]] && TF_POSTFIX="-cpu" || TF_POSTFIX="" && \ pip install --no-cache-dir \ - "jupyter-server-proxy" \ "tensorflow${TF_POSTFIX}" && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" diff --git a/images/tensorflow-notebook/cuda/Dockerfile b/images/tensorflow-notebook/cuda/Dockerfile index 6a0dbd03..a872e25c 100644 --- a/images/tensorflow-notebook/cuda/Dockerfile +++ b/images/tensorflow-notebook/cuda/Dockerfile @@ -11,9 +11,14 @@ LABEL maintainer="Jupyter Project " # Fix: https://github.com/koalaman/shellcheck/wiki/SC3014 SHELL ["/bin/bash", "-o", "pipefail", "-c"] +RUN mamba install --yes \ + 'jupyter-server-proxy' && \ + mamba clean --all -f -y && \ + fix-permissions "${CONDA_DIR}" && \ + fix-permissions "/home/${NB_USER}" + # Install TensorFlow, CUDA and cuDNN with pip RUN pip install --no-cache-dir \ - "jupyter-server-proxy" \ "tensorflow[and-cuda]<=2.17.1" && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" diff --git a/tests/by_image/docker-stacks-foundation/test_packages.py b/tests/by_image/docker-stacks-foundation/test_packages.py index 9a17aa92..dc15d530 100644 --- a/tests/by_image/docker-stacks-foundation/test_packages.py +++ b/tests/by_image/docker-stacks-foundation/test_packages.py @@ -54,6 +54,7 @@ EXCLUDED_PACKAGES = [ "grpcio-status", "grpcio", "hdf5", + "jupyter-server-proxy", "jupyterhub-singleuser", "jupyterlab-git", "mamba",