Skip to content

Commit

Permalink
Merge pull request #1689 from mathbunnyru/asalikhov/ubuntu_jammy
Browse files Browse the repository at this point in the history
Switch to ubuntu:22.04
  • Loading branch information
mathbunnyru committed Aug 4, 2022
2 parents 25f9aa0 + 70940a0 commit 0fd03d9
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Expand Up @@ -8,7 +8,7 @@ version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-20.04
os: ubuntu-22.04
tools:
python: "3.9"
# You can also specify other tool versions:
Expand Down
6 changes: 3 additions & 3 deletions base-notebook/Dockerfile
@@ -1,9 +1,9 @@
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.

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

FROM $ROOT_CONTAINER

Expand Down
5 changes: 3 additions & 2 deletions docs/maintaining/tasks.md
Expand Up @@ -18,8 +18,9 @@ To build new images and publish them to the Docker Hub registry, do the followin

## Updating the Ubuntu Base Image

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

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).
Expand Down
11 changes: 6 additions & 5 deletions docs/using/recipes.md
Expand Up @@ -233,14 +233,15 @@ RUN rm /etc/dpkg/dpkg.cfg.d/excludes && \
USER ${NB_UID}
```

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

```dockerfile
ARG BASE_CONTAINER=ubuntu:focal
ARG BASE_CONTAINER=ubuntu:22.04
```

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:
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-compose/bin/letsencrypt.sh
Expand Up @@ -43,6 +43,6 @@ docker run -it --rm \
# directory so that the FQDN doesn't have to be known later.
docker run -it --rm \
-v "${SECRETS_VOLUME}":/etc/letsencrypt \
ubuntu:20.04 \
ubuntu:22.04 \
bash -c "ln -s /etc/letsencrypt/live/${FQDN}/* /etc/letsencrypt/ && \
find /etc/letsencrypt -type d -exec chmod 755 {} +"
2 changes: 1 addition & 1 deletion tagging/README.md
Expand Up @@ -29,7 +29,7 @@ In this section we will briefly describe source code in this folder and give exa
```python
from tagging.docker_runner import DockerRunner

with DockerRunner("ubuntu:bionic") as container:
with DockerRunner("ubuntu:22.04") as container:
DockerRunner.run_simple_command(container, cmd="env", print_result=True)
```

Expand Down

0 comments on commit 0fd03d9

Please sign in to comment.