Skip to content

Commit 911ef45

Browse files
authored
Merge pull request #1764 from mathbunnyru/asalikhov/better_doc_for_tags
Improve docs about tags
2 parents 0fd03d9 + 064599f commit 911ef45

File tree

9 files changed

+32
-26
lines changed

9 files changed

+32
-26
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ The [User Guide on ReadTheDocs](https://jupyter-docker-stacks.readthedocs.io/en/
2626

2727
**Example 1:**
2828

29-
This command pulls the `jupyter/scipy-notebook` image tagged `807999a41207` from Docker Hub if it is not already present on the local host.
29+
This command pulls the `jupyter/scipy-notebook` image tagged `0fd03d9356de` from Docker Hub if it is not already present on the local host.
3030
It then starts a container running a Jupyter Server and exposes the container's internal port `8888` to port `10000` of the host machine:
3131

3232
```bash
33-
docker run -p 10000:8888 jupyter/scipy-notebook:807999a41207
33+
docker run -p 10000:8888 jupyter/scipy-notebook:0fd03d9356de
3434
```
3535

3636
You can modify the port on which the container's port is exposed by [changing the value of the `-p` option](https://docs.docker.com/engine/reference/run/#expose-incoming-ports) to `-p 8888:8888`.
@@ -45,11 +45,11 @@ The container remains intact for restart after the Jupyter Server exits.
4545

4646
**Example 2:**
4747

48-
This command pulls the `jupyter/datascience-notebook` image tagged `807999a41207` from Docker Hub if it is not already present on the local host.
48+
This command pulls the `jupyter/datascience-notebook` image tagged `0fd03d9356de` from Docker Hub if it is not already present on the local host.
4949
It then starts an _ephemeral_ container running a Jupyter Server and exposes the server on host port 10000.
5050

5151
```bash
52-
docker run -it --rm -p 10000:8888 -v "${PWD}":/home/jovyan/work jupyter/datascience-notebook:807999a41207
52+
docker run -it --rm -p 10000:8888 -v "${PWD}":/home/jovyan/work jupyter/datascience-notebook:0fd03d9356de
5353
```
5454

5555
The use of the `-v` flag in the command mounts the current working directory on the host (`${PWD}` in the example command) as `/home/jovyan/work` in the container.

binder/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# https://hub.docker.com/r/jupyter/base-notebook/tags
55
ARG OWNER=jupyter
6-
ARG BASE_CONTAINER=$OWNER/base-notebook:807999a41207
6+
ARG BASE_CONTAINER=$OWNER/base-notebook:0fd03d9356de
77
FROM $BASE_CONTAINER
88

99
LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>"
@@ -12,6 +12,6 @@ LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>"
1212
# Fix: https://github.com/koalaman/shellcheck/wiki/SC3014
1313
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1414

15-
ENV TAG="807999a41207"
15+
ENV TAG="0fd03d9356de"
1616

1717
COPY --chown=${NB_UID}:${NB_GID} binder/README.ipynb "${HOME}"/README.ipynb

docs/using/recipes.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Create a new Dockerfile like the one shown below.
2929

3030
```dockerfile
3131
# Start from a core stack version
32-
FROM jupyter/datascience-notebook:807999a41207
32+
FROM jupyter/datascience-notebook:0fd03d9356de
3333
# Install in the default python3 environment
3434
RUN pip install --quiet --no-cache-dir 'flake8==3.9.2' && \
3535
fix-permissions "${CONDA_DIR}" && \
@@ -48,7 +48,7 @@ Next, create a new Dockerfile like the one shown below.
4848

4949
```dockerfile
5050
# Start from a core stack version
51-
FROM jupyter/datascience-notebook:807999a41207
51+
FROM jupyter/datascience-notebook:0fd03d9356de
5252
# Install from requirements.txt file
5353
COPY --chown=${NB_UID}:${NB_GID} requirements.txt /tmp/
5454
RUN pip install --quiet --no-cache-dir --requirement /tmp/requirements.txt && \
@@ -60,7 +60,7 @@ For conda, the Dockerfile is similar:
6060

6161
```dockerfile
6262
# Start from a core stack version
63-
FROM jupyter/datascience-notebook:807999a41207
63+
FROM jupyter/datascience-notebook:0fd03d9356de
6464
# Install from requirements.txt file
6565
COPY --chown=${NB_UID}:${NB_GID} requirements.txt /tmp/
6666
RUN mamba install --yes --file /tmp/requirements.txt && \
@@ -283,7 +283,7 @@ To use a specific version of JupyterHub, the version of `jupyterhub` in your ima
283283
version in the Hub itself.
284284

285285
```dockerfile
286-
FROM jupyter/base-notebook:807999a41207
286+
FROM jupyter/base-notebook:0fd03d9356de
287287
RUN pip install --quiet --no-cache-dir jupyterhub==1.4.1 && \
288288
fix-permissions "${CONDA_DIR}" && \
289289
fix-permissions "/home/${NB_USER}"
@@ -474,15 +474,15 @@ For JupyterLab:
474474

475475
```bash
476476
docker run -it --rm \
477-
jupyter/base-notebook:807999a41207 \
477+
jupyter/base-notebook:0fd03d9356de \
478478
start.sh jupyter lab --LabApp.token=''
479479
```
480480

481481
For jupyter classic:
482482

483483
```bash
484484
docker run -it --rm \
485-
jupyter/base-notebook:807999a41207 \
485+
jupyter/base-notebook:0fd03d9356de \
486486
start.sh jupyter notebook --NotebookApp.token=''
487487
```
488488

docs/using/running.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ The following are some common patterns.
1515

1616
**Example 1:**
1717

18-
This command pulls the `jupyter/scipy-notebook` image tagged `807999a41207` from Docker Hub if it is not already present on the local host.
18+
This command pulls the `jupyter/scipy-notebook` image tagged `0fd03d9356de` from Docker Hub if it is not already present on the local host.
1919
It then starts a container running a Jupyter Notebook server and exposes the server on host port 8888.
2020
The server logs appear in the terminal and include a URL to the notebook server.
2121

2222
```bash
23-
docker run -it -p 8888:8888 jupyter/scipy-notebook:807999a41207
23+
docker run -it -p 8888:8888 jupyter/scipy-notebook:0fd03d9356de
2424

2525
# Entered start.sh with args: jupyter lab
2626

@@ -39,7 +39,7 @@ Pressing `Ctrl-C` twice shuts down the notebook server but leaves the container
3939
# list containers
4040
docker ps -a
4141
# CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
42-
# 221331c047c4 jupyter/scipy-notebook:807999a41207 "tini -g -- start-no…" 11 seconds ago Exited (0) 8 seconds ago cranky_benz
42+
# 221331c047c4 jupyter/scipy-notebook:0fd03d9356de "tini -g -- start-no…" 11 seconds ago Exited (0) 8 seconds ago cranky_benz
4343

4444
# start the stopped container
4545
docker start -a 221331c047c4
@@ -53,12 +53,12 @@ docker rm 221331c047c4
5353

5454
**Example 2:**
5555

56-
This command pulls the `jupyter/r-notebook` image tagged `807999a41207` from Docker Hub if it is not already present on the local host.
56+
This command pulls the `jupyter/r-notebook` image tagged `0fd03d9356de` from Docker Hub if it is not already present on the local host.
5757
It then starts a container running a Jupyter Notebook server and exposes the server on host port 10000.
5858
The server logs appear in the terminal and include a URL to the notebook server, but with the internal container port (8888) instead of the correct host port (10000).
5959

6060
```bash
61-
docker run -it --rm -p 10000:8888 -v "${PWD}":/home/jovyan/work jupyter/r-notebook:807999a41207
61+
docker run -it --rm -p 10000:8888 -v "${PWD}":/home/jovyan/work jupyter/r-notebook:0fd03d9356de
6262
```
6363

6464
Pressing `Ctrl-C` twice shuts down the notebook server and immediately destroys the Docker container.
@@ -130,7 +130,7 @@ subuidSize=$(( $(podman info --format "{{ range .Host.IDMappings.UIDMap }}+{{.Si
130130
subgidSize=$(( $(podman info --format "{{ range .Host.IDMappings.GIDMap }}+{{.Size }}{{end }}" ) - 1 ))
131131
```
132132

133-
This command pulls the `docker.io/jupyter/r-notebook` image tagged `807999a41207` from Docker Hub if it is not already present on the local host.
133+
This command pulls the `docker.io/jupyter/r-notebook` image tagged `0fd03d9356de` from Docker Hub if it is not already present on the local host.
134134
It then starts a container running a Jupyter Server and exposes the server on host port 10000.
135135
The server logs appear in the terminal and include a URL to the notebook server, but with the internal container port (8888) instead of the correct host port (10000).
136136

@@ -139,7 +139,7 @@ podman run -it --rm -p 10000:8888 \
139139
-v "${PWD}":/home/jovyan/work --user $uid:$gid \
140140
--uidmap $uid:0:1 --uidmap 0:1:$uid --uidmap $(($uid+1)):$(($uid+1)):$(($subuidSize-$uid)) \
141141
--gidmap $gid:0:1 --gidmap 0:1:$gid --gidmap $(($gid+1)):$(($gid+1)):$(($subgidSize-$gid)) \
142-
docker.io/jupyter/r-notebook:807999a41207
142+
docker.io/jupyter/r-notebook:0fd03d9356de
143143
```
144144

145145
```{warning}

docs/using/selecting.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,15 @@ Every Monday and whenever a pull request is merged, images are rebuilt and pushe
201201
Whenever a docker image is pushed to the container registry, it is tagged with:
202202

203203
- a `latest` tag
204-
- a 12-character git commit SHA like `b9f6ce795cfc`
205-
- a date formatted like `2021-08-29`
206-
- a set of software version tags like `python-3.9.6` and `lab-3.0.16`
204+
- a 12-character git commit SHA like `0fd03d9356de`
205+
- a date formatted like `2022-08-04`
206+
- OS version like `ubuntu-22.04`
207+
- a set of software version tags like `python-3.10.5` and `lab-3.4.4`
208+
209+
```{warning}
210+
- Tags before `2022-07-05` were sometimes incorrect. Please, do not rely on them.
211+
- All `arm64` images have _aarch64-_ tag prefix, for example `aarch64-python-3.10.5`.
212+
```
207213

208214
For stability and reproducibility, you should either reference a date formatted
209215
tag from a date before the current date (in UTC time) or a git commit SHA older

examples/docker-compose/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ You can customize the docker-stack notebook image to deploy by modifying the `no
4242
For example, you can build and deploy a `jupyter/all-spark-notebook` by modifying the Dockerfile like so:
4343

4444
```dockerfile
45-
FROM jupyter/all-spark-notebook:807999a41207
45+
FROM jupyter/all-spark-notebook:0fd03d9356de
4646
# Your RUN commands and so on
4747
```
4848

examples/docker-compose/notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Distributed under the terms of the Modified BSD License.
33

44
# Pick your favorite docker-stacks image
5-
FROM jupyter/minimal-notebook:807999a41207
5+
FROM jupyter/minimal-notebook:0fd03d9356de
66

77
USER root
88

examples/make-deploy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Distributed under the terms of the Modified BSD License.
33

44
# Pick your favorite docker-stacks image
5-
FROM jupyter/minimal-notebook:807999a41207
5+
FROM jupyter/minimal-notebook:0fd03d9356de
66

77
USER root
88

tagging/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The main purpose of the source code in this folder is to properly tag all the im
44
These two processes are closely related, so the source code is widely reused.
55

66
Basic example of a tag is a `python` version tag.
7-
For example, an image `jupyter/base-notebook` with `python 3.8.8` will have a tag `jupyter/base-notebook:python-3.8.8`.
7+
For example, an image `jupyter/base-notebook` with `python 3.10.5` will have a tag `jupyter/base-notebook:python-3.10.5`.
88
This tag (and all the other tags) are pushed to Docker Hub.
99

1010
Manifest is a description of some important part of the image in a `markdown`.

0 commit comments

Comments
 (0)