Skip to content

Commit 4369471

Browse files
committed
Merge branch 'main' into freeze-version
2 parents 35d8922 + c7ceeb2 commit 4369471

File tree

23 files changed

+465
-283
lines changed

23 files changed

+465
-283
lines changed

CUDA.md

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Images available for Python versions ≥ 3.11.1.
1111
https://demo.cuda.jupyter.b-data.ch.
1212
:point_right: You can ask [b-data](mailto:request@b-data.ch?subject=[CUDA%20Jupyter]%20Request%20to%20whitelist%20GitHub%20account) to whitelist your GitHub account for access.
1313

14+
![CUDA screenshot](assets/cuda-screenshot.png)
15+
1416
**Build chain**
1517

1618
The same as the
@@ -74,7 +76,7 @@ cd base && docker build \
7476
--build-arg BASE_IMAGE=ubuntu \
7577
--build-arg BASE_IMAGE_TAG=22.04 \
7678
--build-arg BUILD_ON_IMAGE=glcr.b-data.ch/cuda/python/ver \
77-
--build-arg PYTHON_VERSION=3.11.5 \
79+
--build-arg PYTHON_VERSION=3.12.0 \
7880
--build-arg CUDA_IMAGE_FLAVOR=devel \
7981
-t jupyterlab/cuda/python/base \
8082
-f latest.Dockerfile .
@@ -163,7 +165,29 @@ current value of `${NB_UID}` and `${NB_GID}`.
163165
164166
The server logs appear in the terminal.
165167
166-
**Using Docker Desktop**
168+
#### Using Podman (rootless mode, 3.11.6+)
169+
170+
Create an empty home directory:
171+
172+
```bash
173+
mkdir "${PWD}/jupyterlab-root"
174+
```
175+
176+
Use the following command to run the container as `root`:
177+
178+
```bash
179+
podman run -it --rm \
180+
--device 'nvidia.com/gpu=all' \
181+
-p 8888:8888 \
182+
-u root \
183+
-v "${PWD}/jupyterlab-root":/home/root \
184+
-e NB_USER=root \
185+
-e NB_UID=0 \
186+
-e NB_GID=0 \
187+
IMAGE[:MAJOR[.MINOR[.PATCH]]] start-notebook.sh --allow-root
188+
```
189+
190+
#### Using Docker Desktop
167191
168192
[Creating a home directory](#create-home-directory) *might* not be required.
169193
Also

CUDA_VERSION_MATRIX.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Topmost entry = Tag `latest`
44

55
| Python | CUDA | cuBLAS | cuDNN | NCCL | TensorRT | Linux distro |
66
|:-----------|:-------|:----------|:------|:-------|:----------|:-------------|
7+
| 3.12.0[^1] | 11.8.0 | 11.11.3.6 | 8.9.6 | 2.15.5 | 8.5.3[^2] | Ubuntu 22.04 |
8+
| 3.11.6 | 11.8.0 | 11.11.3.6 | 8.9.6 | 2.15.5 | 8.5.3[^2] | Ubuntu 22.04 |
79
| 3.11.5 | 11.8.0 | 11.11.3.6 | 8.9.0 | 2.15.5 | 8.5.3[^2] | Ubuntu 22.04 |
810
| 3.11.4 | 11.8.0 | 11.11.3.6 | 8.9.0 | 2.15.5 | 8.5.3[^2] | Ubuntu 22.04 |
911
| 3.10.13 | 11.8.0 | 11.11.3.6 | 8.9.0 | 2.15.5 | 8.5.3[^2] | Ubuntu 22.04 |

NOTES.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,16 @@ modified to
2626

2727
The following startup hooks are put in place:
2828

29-
* [/usr/local/bin/start-notebook.d/populate.sh](base/scripts/usr/local/bin/start-notebook.d/populate.sh)
29+
* [/usr/local/bin/start-notebook.d/10-populate.sh](base/scripts/usr/local/bin/start-notebook.d/10-populate.sh)
3030
to populate a *bind mounted* home directory `/home/jovyan`.
31-
* [/usr/local/bin/before-notebook.d/init.sh](base/scripts/usr/local/bin/before-notebook.d/init.sh) to
31+
* [/usr/local/bin/before-notebook.d/10-init.sh](base/scripts/usr/local/bin/before-notebook.d/10-init.sh) to
3232
* update timezone according to environment variable `TZ`.
3333
* add locales according to environment variable `LANGS`.
3434
* set locale according to environment variable `LANG`.
3535
* update code-server settings.
36+
* [/usr/local/bin/before-notebook.d/90-limits.sh](base/scripts/usr/local/bin/before-notebook.d/90-limits.sh)
37+
to set the *soft limit* for *the maximum amount of virtual memory* based on
38+
the amount of *physical* and *virtual memory* of the host.
3639

3740
### Custom scripts
3841

README.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Images considered stable for Python versions ≥ 3.10.5.
1414

1515
:microscope: Check out `jupyterlab/python/scipy` at https://demo.jupyter.b-data.ch.
1616

17+
![Screenshot](assets/screenshot.png)
18+
1719
**Build chain**
1820

1921
base → scipy
@@ -48,24 +50,34 @@ The following extensions are pre-installed for **code-server**:
4850
:information_source: devtools subtags
4951
* [Docker](https://open-vsx.org/extension/ms-azuretools/vscode-docker)
5052
:information_source: docker subtags
53+
* [EditorConfig for VS Code](https://open-vsx.org/extension/EditorConfig/EditorConfig)
54+
(3.11.3+)
5155
* [ESLint](https://open-vsx.org/extension/dbaeumer/vscode-eslint)
5256
:information_source: devtools subtags
5357
* [Git Graph](https://open-vsx.org/extension/mhutchie/git-graph)
5458
* [GitHub Pull Requests and Issues](https://open-vsx.org/extension/GitHub/vscode-pull-request-github)
59+
(3.11.5+)
5560
* [GitLab Workflow](https://open-vsx.org/extension/GitLab/gitlab-workflow)
5661
* [GitLens — Git supercharged](https://open-vsx.org/extension/eamodio/gitlens)
5762
:information_source: Pinned to version 11.7.0 due to unsolicited AI content (3.11.4+)
5863
* [Excel Viewer](https://open-vsx.org/extension/GrapeCity/gc-excelviewer)
64+
* [hadolint](https://open-vsx.org/extension/exiasr/hadolint)
65+
:information_source: docker subtags (3.11.4+)
5966
* [Jupyter](https://open-vsx.org/extension/ms-toolsai/jupyter)
6067
* [LaTeX Workshop](https://open-vsx.org/extension/James-Yu/latex-workshop)
6168
:information_source: scipy image
69+
* [markdownlint](https://open-vsx.org/extension/DavidAnson/vscode-markdownlint)
70+
(3.11.6+)
6271
* [Path Intellisense](https://open-vsx.org/extension/christian-kohler/path-intellisense)
6372
* [Prettier - Code formatter](https://open-vsx.org/extension/esbenp/prettier-vscode)
6473
:information_source: devtools subtags
6574
* [Project Manager](https://open-vsx.org/extension/alefragnani/project-manager)
6675
* [Python](https://open-vsx.org/extension/ms-python/python)
6776
* [Quarto](https://open-vsx.org/extension/quarto/quarto)
6877
:information_source: scipy image
78+
* Resource Monitor (3.11.4+)
79+
* [ShellCheck](https://open-vsx.org/extension/timonwong/shellcheck)
80+
:information_source: devtools and docker subtags (3.11.4+)
6981
* [YAML](https://open-vsx.org/extension/redhat/vscode-yaml)
7082

7183
**Subtags**
@@ -114,7 +126,7 @@ To install docker, follow the instructions for your platform:
114126

115127
```bash
116128
cd base && docker build \
117-
--build-arg PYTHON_VERSION=3.11.5 \
129+
--build-arg PYTHON_VERSION=3.12.0 \
118130
-t jupyterlab/python/base \
119131
-f latest.Dockerfile .
120132
```
@@ -196,7 +208,7 @@ current value of `${NB_UID}` and `${NB_GID}`.
196208
197209
The server logs appear in the terminal.
198210
199-
#### Using Podman (rootless mode, 3.11.5+)
211+
#### Using Podman (rootless mode, 3.11.6+)
200212
201213
Create an empty home directory:
202214

VERSION_MATRIX.md

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,25 @@
22

33
Topmost entry = Tag `latest`
44

5-
| Python | Jupyter Hub | Jupyter Lab | code‑server (Code) | Git | Git LFS | Pandoc | Quarto[^2] | CTAN date[^2] | Linux distro |
6-
|:-----------|:------------|:------------|:-------------------|:-------|:--------|:-------|:------------|:--------------|:-------------|
7-
| 3.11.5 | 4.0.2 | 3.6.6 | 4.17.1 (1.82.2) | 2.42.0 | 3.4.0 | 3.1.1 | 1.3.450 | 2023‑10‑02 | Debian 12 |
8-
| 3.11.4 | 4.0.2 | 3.6.5 | 4.16.1 (1.80.2) | 2.42.0 | 3.4.0 | 3.1.1 | 1.3.450 | 2023‑08‑24 | Debian 12 |
9-
| 3.10.13 | 4.0.2 | 3.6.5 | 4.16.1 (1.80.2) | 2.42.0 | 3.4.0 | 3.1.1 | 1.3.450 | 2023‑08‑24 | Debian 12 |
10-
| 3.11.3 | 4.0.0 | 3.6.4 | 4.13.0 (1.78.2) | 2.41.0 | 3.3.0 | 3.1.1 | 1.3.361 | 2023‑06‑06 | Debian 11 |
11-
| 3.10.12 | 4.0.0 | 3.6.4 | 4.13.0 (1.78.2) | 2.41.0 | 3.3.0 | 3.1.1 | 1.3.361 | 2023‑06‑06 | Debian 11 |
12-
| 3.11.2[^1] | 3.1.1 | 3.6.3 | 4.9.1 (1.73.1) | 2.40.0 | 3.3.0 | 2.19.2 | 1.2.475[^3] | 2023‑04‑05 | Debian 11 |
13-
| 3.10.11 | 3.1.1 | 3.6.3 | 4.9.1 (1.73.1) | 2.40.0 | 3.3.0 | 2.19.2 | 1.2.475[^3] | 2023‑04‑05 | Debian 11 |
14-
| 3.11.1[^1] | 3.1.1 | 3.5.3 | 4.9.1 (1.73.1) | 2.39.1 | 3.3.0 | 2.19.2 | 1.2.335[^3] | 2023‑02‑08 | Debian 11 |
15-
| 3.10.10 | 3.1.1 | 3.5.3 | 4.9.1 (1.73.1) | 2.39.1 | 3.3.0 | 2.19.2 | 1.2.335[^3] | 2023‑02‑08 | Debian 11 |
16-
| 3.11.0[^1] | 3.1.0 | 3.5.1 | 4.9.0 (1.73.1) | 2.38.1 | 3.3.0 | 2.19.2 | 1.2.269[^3] | 2022‑12‑06 | Debian 11 |
17-
| 3.10.9 | 3.1.0 | 3.5.1 | 4.9.0 (1.73.1) | 2.38.1 | 3.3.0 | 2.19.2 | 1.2.269[^3] | 2022‑12‑06 | Debian 11 |
18-
| 3.10.8 | 2.3.1 | 3.5.0 | 4.7.1 (1.71.2) | 2.38.1 | 3.2.0 | 2.19.2 | 1.1.251[^3] | 2022‑10‑24 | Debian 11 |
19-
| 3.10.7 | 2.3.1 | 3.4.8 | 4.7.1 (1.71.2) | 2.38.0 | 3.2.0 | 2.19.2 | 1.1.251[^3] | 2022‑10‑11 | Debian 11 |
20-
| 3.10.6 | 2.3.1 | 3.4.6 | 4.6.1 (1.70.2) | 2.37.3 | 3.2.0 | 2.19.2 | 1.1.189[^3] | 2022‑09‑06 | Debian 11 |
21-
| 3.10.5 | 2.3.1 | 3.4.4 | 4.5.1 (1.68.1) | 2.37.1 | 3.2.0 | 2.18 | 1.0.37[^3] | 2022‑08‑02 | Debian 11 |
5+
| Python | Jupyter Hub | Jupyter Lab | code‑server (Code) | Git | Git LFS | Pandoc | CTAN date[^2] | Quarto[^2] | Linux distro |
6+
|:-----------|:------------|:------------|:-------------------|:-------|:--------|:-------|:--------------|:------------|:-------------|
7+
| 3.12.0[^1] | 4.0.2 | 4.0.9 | 4.19.1 (1.84.2) | 2.43.0 | 3.4.0 | 3.1.1 | | 1.3.450 | Debian 12 |
8+
| 3.11.6 | 4.0.2 | 4.0.9 | 4.19.0 (1.84.2) | 2.43.0 | 3.4.0 | 3.1.1 | | 1.3.450 | Debian 12 |
9+
| 3.11.5 | 4.0.2 | 3.6.6 | 4.17.1 (1.82.2) | 2.42.0 | 3.4.0 | 3.1.1 | 2023‑10‑02 | 1.3.450 | Debian 12 |
10+
| 3.11.4 | 4.0.2 | 3.6.5 | 4.16.1 (1.80.2) | 2.42.0 | 3.4.0 | 3.1.1 | 2023‑08‑24 | 1.3.450 | Debian 12 |
11+
| 3.10.13 | 4.0.2 | 3.6.5 | 4.16.1 (1.80.2) | 2.42.0 | 3.4.0 | 3.1.1 | 2023‑08‑24 | 1.3.450 | Debian 12 |
12+
| 3.11.3 | 4.0.0 | 3.6.4 | 4.13.0 (1.78.2) | 2.41.0 | 3.3.0 | 3.1.1 | 2023‑06‑06 | 1.3.361 | Debian 11 |
13+
| 3.10.12 | 4.0.0 | 3.6.4 | 4.13.0 (1.78.2) | 2.41.0 | 3.3.0 | 3.1.1 | 2023‑06‑06 | 1.3.361 | Debian 11 |
14+
| 3.11.2[^1] | 3.1.1 | 3.6.3 | 4.9.1 (1.73.1) | 2.40.0 | 3.3.0 | 2.19.2 | 2023‑04‑05 | 1.2.475[^3] | Debian 11 |
15+
| 3.10.11 | 3.1.1 | 3.6.3 | 4.9.1 (1.73.1) | 2.40.0 | 3.3.0 | 2.19.2 | 2023‑04‑05 | 1.2.475[^3] | Debian 11 |
16+
| 3.11.1[^1] | 3.1.1 | 3.5.3 | 4.9.1 (1.73.1) | 2.39.1 | 3.3.0 | 2.19.2 | 2023‑02‑08 | 1.2.335[^3] | Debian 11 |
17+
| 3.10.10 | 3.1.1 | 3.5.3 | 4.9.1 (1.73.1) | 2.39.1 | 3.3.0 | 2.19.2 | 2023‑02‑08 | 1.2.335[^3] | Debian 11 |
18+
| 3.11.0[^1] | 3.1.0 | 3.5.1 | 4.9.0 (1.73.1) | 2.38.1 | 3.3.0 | 2.19.2 | 2022‑12‑06 | 1.2.269[^3] | Debian 11 |
19+
| 3.10.9 | 3.1.0 | 3.5.1 | 4.9.0 (1.73.1) | 2.38.1 | 3.3.0 | 2.19.2 | 2022‑12‑06 | 1.2.269[^3] | Debian 11 |
20+
| 3.10.8 | 2.3.1 | 3.5.0 | 4.7.1 (1.71.2) | 2.38.1 | 3.2.0 | 2.19.2 | 2022‑10‑24 | 1.1.251[^3] | Debian 11 |
21+
| 3.10.7 | 2.3.1 | 3.4.8 | 4.7.1 (1.71.2) | 2.38.0 | 3.2.0 | 2.19.2 | 2022‑10‑11 | 1.1.251[^3] | Debian 11 |
22+
| 3.10.6 | 2.3.1 | 3.4.6 | 4.6.1 (1.70.2) | 2.37.3 | 3.2.0 | 2.19.2 | 2022‑09‑06 | 1.1.189[^3] | Debian 11 |
23+
| 3.10.5 | 2.3.1 | 3.4.4 | 4.5.1 (1.68.1) | 2.37.1 | 3.2.0 | 2.18 | 2022‑08‑02 | 1.0.37[^3] |Debian 11 |
2224

2325
[^1]: w/o numba
2426
[^2]: scipy image

assets/cuda-screenshot.png

524 KB
Loading

assets/screenshot.png

268 KB
Loading

0 commit comments

Comments
 (0)