Skip to content

Commit 0fd03d9

Browse files
authored
Merge pull request #1689 from mathbunnyru/asalikhov/ubuntu_jammy
Switch to ubuntu:22.04
2 parents 25f9aa0 + 70940a0 commit 0fd03d9

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
lines changed

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ version: 2
88

99
# Set the version of Python and other tools you might need
1010
build:
11-
os: ubuntu-20.04
11+
os: ubuntu-22.04
1212
tools:
1313
python: "3.9"
1414
# You can also specify other tool versions:

base-notebook/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Copyright (c) Jupyter Development Team.
22
# Distributed under the terms of the Modified BSD License.
33

4-
# Ubuntu 20.04 (focal)
5-
# https://hub.docker.com/_/ubuntu/?tab=tags&name=focal
6-
ARG ROOT_CONTAINER=ubuntu:focal
4+
# Ubuntu 22.04 (jammy)
5+
# https://hub.docker.com/_/ubuntu/?tab=tags&name=jammy
6+
ARG ROOT_CONTAINER=ubuntu:22.04
77

88
FROM $ROOT_CONTAINER
99

docs/maintaining/tasks.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ To build new images and publish them to the Docker Hub registry, do the followin
1818

1919
## Updating the Ubuntu Base Image
2020

21-
`minimal-notebook` is based on the Latest LTS Ubuntu docker image.
22-
Other images are directly or indirectly inherited from `minimal-notebook`.
21+
`base-notebook` is based on the LTS Ubuntu docker image.
22+
We wait for the first point release of the new LTS Ubuntu before updating the version.
23+
Other images are directly or indirectly inherited from `base-notebook`.
2324
We rebuild our images automatically each week, which means they frequently receive the updates.
2425

2526
When there's a security fix in the Ubuntu base image, it's a good idea to manually trigger images rebuild [from the GitHub actions workflow UI](https://github.com/jupyter/docker-stacks/actions/workflows/docker.yml).

docs/using/recipes.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,15 @@ RUN rm /etc/dpkg/dpkg.cfg.d/excludes && \
233233
USER ${NB_UID}
234234
```
235235

236-
Adding the documentation on top of the existing single-user image wastes a lot of space and requires
237-
reinstalling every system package. Which can take additional time and bandwidth; the
238-
`datascience-notebook` image has been shown to grow by almost 3GB when adding manpages in this way.
236+
Adding the documentation on top of the existing single-user image wastes a lot of space
237+
and requires reinstalling every system package,
238+
which can take additional time and bandwidth.
239+
The `datascience-notebook` image has been shown to grow by almost 3GB when adding manpages in this way.
239240
Enabling manpages in the base Ubuntu layer prevents this container bloat.
240-
To achieve this, use the previous `Dockerfile` with the original ubuntu image (`ubuntu:focal`) as your base container:
241+
To achieve this, use the previous `Dockerfile`'s commands with the original `ubuntu` image as your base container:
241242

242243
```dockerfile
243-
ARG BASE_CONTAINER=ubuntu:focal
244+
ARG BASE_CONTAINER=ubuntu:22.04
244245
```
245246

246247
For Ubuntu 18.04 (bionic) and earlier, you may also require to a workaround for a mandb bug, which was fixed in mandb >= 2.8.6.1:

examples/docker-compose/bin/letsencrypt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ docker run -it --rm \
4343
# directory so that the FQDN doesn't have to be known later.
4444
docker run -it --rm \
4545
-v "${SECRETS_VOLUME}":/etc/letsencrypt \
46-
ubuntu:20.04 \
46+
ubuntu:22.04 \
4747
bash -c "ln -s /etc/letsencrypt/live/${FQDN}/* /etc/letsencrypt/ && \
4848
find /etc/letsencrypt -type d -exec chmod 755 {} +"

tagging/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ In this section we will briefly describe source code in this folder and give exa
2929
```python
3030
from tagging.docker_runner import DockerRunner
3131

32-
with DockerRunner("ubuntu:bionic") as container:
32+
with DockerRunner("ubuntu:22.04") as container:
3333
DockerRunner.run_simple_command(container, cmd="env", print_result=True)
3434
```
3535

0 commit comments

Comments
 (0)