Merge branch 'main' into freeze-version

Author: benz0li

CUDA.md

@@ -83,7 +83,7 @@ cd base && docker build \
   --build-arg BASE_IMAGE=ubuntu \
   --build-arg BASE_IMAGE_TAG=22.04 \
   --build-arg BUILD_ON_IMAGE=glcr.b-data.ch/cuda/python/ver \
-  --build-arg PYTHON_VERSION=3.13.0 \
+  --build-arg PYTHON_VERSION=3.13.1 \
   --build-arg CUDA_IMAGE_FLAVOR=devel \
   -t jupyterlab/cuda/python/base \
   -f latest.Dockerfile .
@@ -216,7 +216,7 @@ docker run -it --rm \
 **What makes this project different:**
 
 1. Multi-arch: `linux/amd64`, `linux/arm64/v8`
-1. Derived from [`nvidia/cuda:12.6.3-devel-ubuntu22.04`](https://hub.docker.com/r/nvidia/cuda/tags?page=1&name=12.6.3-devel-ubuntu22.04)
+1. Derived from [`nvidia/cuda:12.8.0-devel-ubuntu22.04`](https://hub.docker.com/r/nvidia/cuda/tags?page=1&name=12.8.0-devel-ubuntu22.04)
     * including development libraries and headers
 1. TensortRT and TensorRT plugin libraries
     * including development libraries and headers
@@ -225,4 +225,4 @@ docker run -it --rm \
 1. Just Python – no [Conda](https://github.com/conda/conda) /
    [Mamba](https://github.com/mamba-org/mamba)
 
-See [Notes](NOTES.md) for tweaks, settings, etc.
+See [CUDA Notes](CUDA_NOTES.md) for tweaks, settings, etc.

CUDA_NOTES.md

@@ -0,0 +1,21 @@
+# Notes on CUDA
+
+The CUDA and OS versions are selected as follows:
+
+* CUDA: The lastest version that has image flavour `devel` including cuDNN
+  available.
+* OS: The latest version that has TensortRT libraries for `amd64` available.  
+  :information_source: It is taking quite a long time for these to be available
+  for `arm64`.
+
+## Tweaks
+
+### Environment variables
+
+**Versions**
+
+* `CUDA_VERSION`
+
+**Miscellaneous**
+
+* `CUDA_IMAGE`: The CUDA image it is derived from.

CUDA_VERSION_MATRIX.md

@@ -6,8 +6,9 @@ Topmost entry = Tag `latest`
 
 | Python     | CUDA   | cuBLAS    | cuDNN     | NCCL   | TensorRT[^2]            | Linux distro |
 |:-----------|:-------|:----------|:----------|:-------|:------------------------|:-------------|
-| 3.13.0[^1] | 12.6.3 | 12.6.4.1  | 9.6.0.74  | 2.23.4 | n/a                     | Ubuntu 22.04 |
+| 3.13.1     | 12.8.0 | 12.8.3.14 | 9.7.0.66  | 2.25.1 | n/a                     | Ubuntu 22.04 |
 | 3.12.8     | 12.6.3 | 12.6.4.1  | 8.9.7.29  | 2.23.4 | 10.7.0.23/<br>10.3.0.26 | Ubuntu 22.04 |
+| 3.13.0[^1] | 12.6.3 | 12.6.4.1  | 9.6.0.74  | 2.23.4 | n/a                     | Ubuntu 22.04 |
 | 3.12.7     | 12.6.3 | 12.6.4.1  | 8.9.7.29  | 2.23.4 | 10.7.0.23/<br>10.3.0.26 | Ubuntu 22.04 |
 | 3.11.10    | 11.8.0 | 11.11.3.6 | 8.9.6.50  | 2.15.5 | 8.5.3[^3]               | Ubuntu 22.04 |
 | 3.12.6     | 12.6.1 | 12.6.1.4  | 8.9.7.29  | 2.23.4 | 10.4.0.26/<br>10.3.0.26 | Ubuntu 22.04 |
@@ -44,6 +45,7 @@ Topmost entry = Tag `latest`
 
 | Python | CUDA | PyTorch[^4]                  | TensorFlow[^5]            |
 |:-------|:-----|:-----------------------------|:--------------------------|
+| 3.13   | 12.8 | version ≥ 2.6 (experimental) | n/a                       |
 | 3.13   | 12.6 | version ≥ 2.6 (experimental) | n/a                       |
 | 3.12   | 12.6 | version ≥ 2.2                | version ≥ 2.16            |
 | 3.12   | 12.5 | version ≥ 2.2                | version ≥ 2.16            |
@@ -61,6 +63,7 @@ given.
 
 | CUDA   | Linux driver version | Windows driver version[^6] |
 |:-------|:---------------------|:---------------------------|
+| 12.8.0 | ≥ 570.26             | ≥ 570.65                   |
 | 12.6.3 | ≥ 560.35.05          | ≥ 561.17                   |
 | 12.6.2 | ≥ 560.35.03          | ≥ 560.94                   |
 | 12.6.1 | ≥ 560.35.03          | ≥ 560.94                   |
@@ -79,6 +82,7 @@ Only works with
 
 | CUDA   | Driver version 535[^7] | Driver version 470[^8] |
 |:-------|:----------------------:|:----------------------:|
+| 12.8.0 | 🟢                      | 🔵                      |
 | 12.6.3 | 🟢                      | 🔵                      |
 | 12.6.2 | 🟢                      | 🔵                      |
 | 12.6.1 | 🟢                      | 🔵                      |

DEVTOOLS_NOTES.md

@@ -0,0 +1,18 @@
+# Notes on subtag `devtools`
+
+Node.js is installed with corepack enabled by default. Use it to manage Yarn
+and/or pnpm:
+
+* [Installation | Yarn - Package Manager > Updating the global Yarn version](https://yarnpkg.com/getting-started/install#updating-the-global-yarn-version)
+* [Installation | pnpm > Using Corepack](https://pnpm.io/installation#using-corepack)
+
+## System Python
+
+Package `libsecret-1-dev` depends on `python3` from the system's package
+repository.
+
+The system's Python version is installed at `/usr/bin`.  
+
+:information_source: Because [a more recent Python version](NOTES.md#python) is
+installed at `/usr/local/bin`, it takes precedence over the system's Python
+version.

NOTES.md

@@ -167,44 +167,3 @@ are installed.
 The latest Python version is installed at `/usr/local/bin`, regardless of
 whether all packages – such as numba, tensorflow, etc. – are already compatible
 with it.
-
-# Additional notes on CUDA
-
-The CUDA and OS versions are selected as follows:
-
-* CUDA: The lastest version that has image flavour `devel` including cuDNN
-  available.
-* OS: The latest version that has TensortRT libraries for `amd64` available.  
-  :information_source: It is taking quite a long time for these to be available
-  for `arm64`.
-
-## Tweaks
-
-### Environment variables
-
-**Versions**
-
-* `CUDA_VERSION`
-
-**Miscellaneous**
-
-* `CUDA_IMAGE`: The CUDA image it is derived from.
-
-# Additional notes on subtag `devtools`
-
-Node.js is installed with corepack enabled by default. Use it to manage Yarn
-and/or pnpm:
-
-* [Installation | Yarn - Package Manager > Updating the global Yarn version](https://yarnpkg.com/getting-started/install#updating-the-global-yarn-version)
-* [Installation | pnpm > Using Corepack](https://pnpm.io/installation#using-corepack)
-
-## System Python
-
-Package `libsecret-1-dev` depends on `python3` from the system's package
-repository.
-
-The system's Python version is installed at `/usr/bin`.  
-
-:information_source: Because [a more recent Python version](#python) is
-installed at `/usr/local/bin`, it takes precedence over the system's Python
-version.

README.md

@@ -100,6 +100,8 @@ The following extensions are pre-installed for **code-server**:
 * `{PYTHON_VERSION,latest}-devtools-docker`: The combination of both
 * `{PYTHON_VERSION,latest}-devtools-docker-root`: The combination of all three
 
+See also [Notes on subtag `devtools`](DEVTOOLS_NOTES.md).
+
 ## Table of Contents
 
 * [Prerequisites](#prerequisites)
@@ -130,7 +132,7 @@ To install docker, follow the instructions for your platform:
 
 ```bash
 cd base && docker build \
-  --build-arg PYTHON_VERSION=3.13.0 \
+  --build-arg PYTHON_VERSION=3.13.1 \
   -t jupyterlab/python/base \
   -f latest.Dockerfile .
 ```

VERSION_MATRIX.md

@@ -8,8 +8,9 @@ Topmost entry = Tag `latest`
 
 | Python     | Jupyter Hub | Jupyter Lab | code‑server (Code) | Neovim | Git    | Git LFS | Pandoc | Linux distro |
 |:-----------|:------------|:------------|:-------------------|:-------|:-------|:--------|:-------|:-------------|
-| 3.13.0[^1] | 5.2.1       | 4.2.5       | 4.95.3 (1.95.3)    | 0.10.2 | 2.47.1 | 3.6.0   | 3.4    | Debian 12    |
+| 3.13.1     | 5.2.1       | 4.3.5       | 4.96.4 (1.96.4)    | 0.10.4 | 2.48.1 | 3.6.1   | 3.4    | Debian 12    |
 | 3.12.8     | 5.2.1       | 4.2.5       | 4.95.3 (1.95.3)    | 0.10.2 | 2.47.1 | 3.6.0   | 3.4    | Debian 12    |
+| 3.13.0[^1] | 5.2.1       | 4.2.5       | 4.95.3 (1.95.3)    | 0.10.2 | 2.47.1 | 3.6.0   | 3.4    | Debian 12    |
 | 3.12.7     | 5.2.1       | 4.2.5       | 4.95.3 (1.95.3)    | 0.10.2 | 2.47.1 | 3.6.0   | 3.4    | Debian 12    |
 | 3.11.10    | 5.2.1       | 4.2.5       | 4.95.3 (1.95.3)    | 0.10.2 | 2.47.1 | 3.6.0   | 3.4    | Debian 12    |
 | 3.12.6     | 5.1.0       | 4.2.5       | 4.93.1 (1.93.1)    | 0.10.1 | 2.46.2 | 3.5.1   | 3.2    | Debian 12    |
@@ -43,8 +44,9 @@ Topmost entry = Tag `latest`
 
 | Python     | CTAN date  | Quarto      |
 |:-----------|:-----------|:------------|
-| 3.13.0[^1] | 2024‑12‑03 | 1.6.39      |
+| 3.13.1[^1] |            | 1.6.40      |
 | 3.12.8     |            | 1.6.39      |
+| 3.13.0[^1] | 2024‑12‑03 | 1.6.39      |
 | 3.12.7     | 2024‑12‑03 | 1.6.39      |
 | 3.11.10    | 2024‑12‑03 | 1.6.39      |
 | 3.12.6     | 2024‑10‑01 | 1.5.57      |

base/.gitlab-ci.yml

@@ -1,6 +1,6 @@
 .env:
   variables:
-    PYTHON_VERSION: "3.13.0"
+    PYTHON_VERSION: "3.13.1"
     TAG_VERSION_MAJ_MIN: "false"
     TAG_VERSION_MAJ: "false"
 

base/conf/jupyter/etc/jupyter/jupyter_server_config.py

@@ -10,8 +10,8 @@
 from jupyter_core.paths import jupyter_data_dir
 
 c = get_config()  # noqa: F821 # type: ignore
-c.ServerApp.ip = "0.0.0.0"
-c.ServerApp.port = 8888
+# Listen on all interfaces (IPv4 and IPv6)
+c.ServerApp.ip = ""
 #c.ServerApp.open_browser = False
 
 # https://github.com/jupyter/notebook/issues/3130

base/latest.Dockerfile

@@ -7,12 +7,12 @@ ARG CUDA_IMAGE_FLAVOR
 ARG NB_USER=jovyan
 ARG NB_UID=1000
 ARG JUPYTERHUB_VERSION=5.2.1
-ARG JUPYTERLAB_VERSION=4.2.5
+ARG JUPYTERLAB_VERSION=4.3.5
 ARG CODE_BUILTIN_EXTENSIONS_DIR=/opt/code-server/lib/vscode/extensions
-ARG CODE_SERVER_VERSION=4.95.3
-ARG NEOVIM_VERSION=0.10.2
-ARG GIT_VERSION=2.47.1
-ARG GIT_LFS_VERSION=3.6.0
+ARG CODE_SERVER_VERSION=4.96.4
+ARG NEOVIM_VERSION=0.10.4
+ARG GIT_VERSION=2.48.1
+ARG GIT_LFS_VERSION=3.6.1
 ARG PANDOC_VERSION=3.4
 
 FROM ${BUILD_ON_IMAGE}${PYTHON_VERSION:+:}${PYTHON_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMAGE_FLAVOR} AS files
@@ -327,7 +327,10 @@ RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master
 COPY --from=files /files /
 COPY --from=files /files/var/backups/skel ${HOME}
 
-EXPOSE 8888
+ARG JUPYTER_PORT=8888
+ENV JUPYTER_PORT=${JUPYTER_PORT}
+
+EXPOSE $JUPYTER_PORT
 
 ## Configure container startup
 ENTRYPOINT ["tini", "-g", "--", "start.sh"]

base/scripts/usr/local/bin/start-singleuser.sh

@@ -4,10 +4,7 @@
 
 set -e
 
-# set default ip to 0.0.0.0
-if [[ "${NOTEBOOK_ARGS} $*" != *"--ip="* ]]; then
-    NOTEBOOK_ARGS="--ip=0.0.0.0 ${NOTEBOOK_ARGS}"
-fi
+# JupyterHub singleuser arguments are set using environment variables
 
 echo "Executing: jupyterhub-singleuser" "${NOTEBOOK_ARGS}" "$@"
 # shellcheck disable=SC1091,SC2086

base/scripts/usr/local/bin/start.sh

@@ -116,8 +116,8 @@ if [ "$(id -u)" == 0 ]; then
         userdel "${NB_USER}"
         useradd --no-log-init --home "/home/${NB_USER}${DOMAIN:+@$DOMAIN}" --shell "$(which zsh)" --uid "${NB_UID}" --gid "${NB_GID}" --groups 100 "${NB_USER}"
     else
-        # Otherwise, and if not the jovyan user, add it to the default group
-        if [[ "${NB_USER}" != "jovyan" ]]; then
+        # Otherwise, and if not jovyan or root, add it to the default group
+        if [[ "${NB_USER}" != "jovyan" && "${NB_USER}" != "root" ]]; then
             usermod -a -G 100 "${NB_USER}"
         fi
     fi

common/subtags/devtools/latest.Dockerfile

@@ -3,7 +3,7 @@ ARG BASE_IMAGE_TAG=12
 ARG BUILD_ON_IMAGE
 ARG PYTHON_VERSION
 
-ARG NODE_VERSION=20.18.0
+ARG NODE_VERSION=20.18.1
 ARG CODE_BUILTIN_EXTENSIONS_DIR=/opt/code-server/lib/vscode/extensions
 
 FROM glcr.b-data.ch/nodejs/nsi/${NODE_VERSION}/${BASE_IMAGE}:${BASE_IMAGE_TAG} as nsi

scipy/.gitlab-ci.yml

@@ -1,6 +1,6 @@
 .env:
   variables:
-    PYTHON_VERSION: "3.13.0"
+    PYTHON_VERSION: "3.13.1"
     CTAN_REPO_BUILD_LATEST: "https://mirror.init7.net/ctan/systems/texlive/tlnet"
     TAG_VERSION_MAJ_MIN: "false"
     TAG_VERSION_MAJ: "false"

scipy/latest.Dockerfile

@@ -1,7 +1,7 @@
 ARG BUILD_ON_IMAGE=glcr.b-data.ch/jupyterlab/python/base
 ARG PYTHON_VERSION
 ARG CODE_BUILTIN_EXTENSIONS_DIR=/opt/code-server/lib/vscode/extensions
-ARG QUARTO_VERSION=1.6.39
+ARG QUARTO_VERSION=1.6.40
 ARG CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet
 
 FROM ${BUILD_ON_IMAGE}${PYTHON_VERSION:+:}${PYTHON_VERSION}
@@ -111,7 +111,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
     ipympl\
     ipywidgets \
     matplotlib \
-    #numba \
+    numba \
     numexpr \
     numpy \
     pandas \