From 1ea99c016e2855d92ec3503c506c8778e79c5a8c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 21 Nov 2026 09:09:28 +0000 Subject: [PATCH] cli: sync docs with docker/cli v29.10.0 --- data/cli/engine/docker_container_commit.yaml | 16 ++++----- data/cli/engine/docker_container_ls.yaml | 10 +++--- data/cli/engine/docker_image_pull.yaml | 38 ++++++++++---------- data/cli/engine/docker_login.yaml | 7 ++-- data/cli/engine/docker_service_create.yaml | 2 +- data/cli/engine/docker_system_events.yaml | 4 +-- 6 files changed, 38 insertions(+), 39 deletions(-) diff --git a/data/cli/engine/docker_container_commit.yaml b/data/cli/engine/docker_container_commit.yaml index 523e7d9e4e0f..581a9221acfc 100644 --- a/data/cli/engine/docker_container_commit.yaml +++ b/data/cli/engine/docker_container_commit.yaml @@ -90,8 +90,8 @@ examples: |- $ docker ps CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES - c3f279d17e0a ubuntu:24.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky - 197387f1b436 ubuntu:24.04 /bin/bash 7 days ago Up 25 hours focused_hamilton + c3f279d17e0a ubuntu:26.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky + 197387f1b436 ubuntu:26.04 /bin/bash 7 days ago Up 25 hours focused_hamilton $ docker commit c3f279d17e0a svendowideit/testimage:version3 @@ -109,8 +109,8 @@ examples: |- $ docker ps CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES - c3f279d17e0a ubuntu:24.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky - 197387f1b436 ubuntu:24.04 /bin/bash 7 days ago Up 25 hours focused_hamilton + c3f279d17e0a ubuntu:26.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky + 197387f1b436 ubuntu:26.04 /bin/bash 7 days ago Up 25 hours focused_hamilton $ docker inspect -f "{{ .Config.Env }}" c3f279d17e0a @@ -131,8 +131,8 @@ examples: |- $ docker ps CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES - c3f279d17e0a ubuntu:24.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky - 197387f1b436 ubuntu:24.04 /bin/bash 7 days ago Up 25 hours focused_hamilton + c3f279d17e0a ubuntu:26.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky + 197387f1b436 ubuntu:26.04 /bin/bash 7 days ago Up 25 hours focused_hamilton $ docker commit --change='CMD ["apachectl", "-DFOREGROUND"]' -c "EXPOSE 80" c3f279d17e0a svendowideit/testimage:version4 @@ -146,8 +146,8 @@ examples: |- CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES 89373736e2e7 testimage:version4 "apachectl -DFOREGROU" 3 seconds ago Up 2 seconds 80/tcp distracted_fermat - c3f279d17e0a ubuntu:24.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky - 197387f1b436 ubuntu:24.04 /bin/bash 7 days ago Up 25 hours focused_hamilton + c3f279d17e0a ubuntu:26.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky + 197387f1b436 ubuntu:26.04 /bin/bash 7 days ago Up 25 hours focused_hamilton ``` deprecated: false hidden: false diff --git a/data/cli/engine/docker_container_ls.yaml b/data/cli/engine/docker_container_ls.yaml index 24648b6f9400..254bf7705448 100644 --- a/data/cli/engine/docker_container_ls.yaml +++ b/data/cli/engine/docker_container_ls.yaml @@ -121,7 +121,7 @@ examples: |- $ docker ps --no-trunc CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES - ca5534a51dd04bbcebe9b23ba05f389466cf0c190f1f8f182d7eea92a9671d00 ubuntu:24.04 bash 17 seconds ago Up 16 seconds 3300-3310/tcp webapp + ca5534a51dd04bbcebe9b23ba05f389466cf0c190f1f8f182d7eea92a9671d00 ubuntu:26.04 bash 17 seconds ago Up 16 seconds 3300-3310/tcp webapp 9ca9747b233100676a48cc7806131586213fa5dab86dd1972d6a8732e3a84a4d crosbymichael/redis:latest /redis-server --dir 33 minutes ago Up 33 minutes 6379/tcp redis,webapp/db ``` @@ -328,13 +328,13 @@ examples: |- 919e1179bdb8 ubuntu-c1 "top" About a minute ago Up About a minute admiring_lovelace ``` - Match containers based on the `ubuntu` version `24.04` image: + Match containers based on the `ubuntu` version `26.04` image: ```console - $ docker ps --filter ancestor=ubuntu:24.04 + $ docker ps --filter ancestor=ubuntu:26.04 CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES - 82a598284012 ubuntu:24.04 "top" 3 minutes ago Up 3 minutes sleepy_bose + 82a598284012 ubuntu:26.04 "top" 3 minutes ago Up 3 minutes sleepy_bose ``` The following matches containers based on the layer `d0e008c6cf02` or an image @@ -344,7 +344,7 @@ examples: |- $ docker ps --filter ancestor=d0e008c6cf02 CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES - 82a598284012 ubuntu:24.04 "top" 3 minutes ago Up 3 minutes sleepy_bose + 82a598284012 ubuntu:26.04 "top" 3 minutes ago Up 3 minutes sleepy_bose ``` #### Create time diff --git a/data/cli/engine/docker_image_pull.yaml b/data/cli/engine/docker_image_pull.yaml index d1dda47d76d5..62e0581f09a3 100644 --- a/data/cli/engine/docker_image_pull.yaml +++ b/data/cli/engine/docker_image_pull.yaml @@ -104,18 +104,18 @@ examples: |- Docker images can consist of multiple layers. In the example above, the image consists of a single layer; `e756f3fdd6a3`. - Layers can be reused by images. For example, the `debian:bookworm` image shares - its layer with the `debian:latest`. Pulling the `debian:bookworm` image therefore + Layers can be reused by images. For example, the `debian:trixie` image shares + its layer with the `debian:latest`. Pulling the `debian:trixie` image therefore only pulls its metadata, but not its layers, because the layer is already present locally: ```console - $ docker image pull debian:bookworm + $ docker image pull debian:trixie - bookworm: Pulling from library/debian + trixie: Pulling from library/debian Digest: sha256:3f1d6c17773a45c97bd8f158d665c9709d7b29ed7917ac934086ad96f92e4510 - Status: Downloaded newer image for debian:bookworm - docker.io/library/debian:bookworm + Status: Downloaded newer image for debian:trixie + docker.io/library/debian:trixie ``` To see which images are present locally, use the [`docker images`](/reference/cli/docker/image/ls/) @@ -125,13 +125,13 @@ examples: |- $ docker images REPOSITORY TAG IMAGE ID CREATED SIZE - debian bookworm 4eacea30377a 8 days ago 124MB + debian trixie 4eacea30377a 8 days ago 124MB debian latest 4eacea30377a 8 days ago 124MB ``` Docker uses a content-addressable image store, and the image ID is a SHA256 digest covering the image's configuration and layers. In the example above, - `debian:bookworm` and `debian:latest` have the same image ID because they are + `debian:trixie` and `debian:latest` have the same image ID because they are the same image tagged with different names. Because they are the same image, their layers are stored only once and do not consume extra disk space. @@ -144,8 +144,8 @@ examples: |- So far, you've pulled images by their name (and "tag"). Using names and tags is a convenient way to work with images. When using tags, you can `docker pull` an image again to make sure you have the most up-to-date version of that image. - For example, `docker pull ubuntu:24.04` pulls the latest version of the Ubuntu - 24.04 image. + For example, `docker pull ubuntu:26.04` pulls the latest version of the Ubuntu + 26.04 image. In some cases you don't want images to be updated to newer versions, but prefer to use a fixed version of an image. Docker enables you to pull an image by its @@ -154,16 +154,16 @@ examples: |- and guarantee that the image you're using is always the same. To know the digest of an image, pull the image first. Let's pull the latest - `ubuntu:24.04` image from Docker Hub: + `ubuntu:26.04` image from Docker Hub: ```console - $ docker pull ubuntu:24.04 + $ docker pull ubuntu:26.04 - 24.04: Pulling from library/ubuntu + 26.04: Pulling from library/ubuntu 125a6e411906: Pull complete Digest: sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30 - Status: Downloaded newer image for ubuntu:24.04 - docker.io/library/ubuntu:24.04 + Status: Downloaded newer image for ubuntu:26.04 + docker.io/library/ubuntu:26.04 ``` Docker prints the digest of the image after the pull has finished. In the example @@ -251,11 +251,11 @@ examples: |- ```console $ docker image ls --filter reference=ubuntu REPOSITORY TAG IMAGE ID CREATED SIZE - ubuntu 22.04 8a3cdc4d1ad3 3 weeks ago 77.9MB - ubuntu jammy 8a3cdc4d1ad3 3 weeks ago 77.9MB - ubuntu 24.04 35a88802559d 6 weeks ago 78.1MB + ubuntu 24.04 8a3cdc4d1ad3 3 weeks ago 77.9MB + ubuntu noble 8a3cdc4d1ad3 3 weeks ago 77.9MB + ubuntu 26.04 35a88802559d 6 weeks ago 78.1MB ubuntu latest 35a88802559d 6 weeks ago 78.1MB - ubuntu noble 35a88802559d 6 weeks ago 78.1MB + ubuntu resolute 35a88802559d 6 weeks ago 78.1MB ``` ### Cancel a pull diff --git a/data/cli/engine/docker_login.yaml b/data/cli/engine/docker_login.yaml index 96f9545b230d..4fdf76d4ec05 100644 --- a/data/cli/engine/docker_login.yaml +++ b/data/cli/engine/docker_login.yaml @@ -209,13 +209,12 @@ examples: |- ```console $ docker login - USING WEB-BASED LOGIN - To sign in with credentials on the command line, use 'docker login -u ' + Using web-based login. To sign in with credentials on the command line, use 'docker login -u ' Your one-time device confirmation code is: LNFR-PGCJ - Press ENTER to open your browser or submit your device code here: https://login.docker.com/activate + Open this URL to authenticate: https://login.docker.com/activate?user_code=LNFR-PGCJ - Waiting for authentication in the browser… + Press ENTER to open the URL in your browser, or Ctrl+C to cancel. ``` After entering the code in your browser, you are authenticated to Docker Hub diff --git a/data/cli/engine/docker_service_create.yaml b/data/cli/engine/docker_service_create.yaml index 2cdb9fad0e87..7398a747ab9e 100644 --- a/data/cli/engine/docker_service_create.yaml +++ b/data/cli/engine/docker_service_create.yaml @@ -1414,7 +1414,7 @@ examples: |- | `node.platform.os` | Node operating system | `node.platform.os==windows` | | `node.platform.arch` | Node architecture | `node.platform.arch==x86_64` | | `node.labels` | User-defined node labels | `node.labels.security==high` | - | `engine.labels` | Docker Engine's labels | `engine.labels.operatingsystem==ubuntu-24.04` | + | `engine.labels` | Docker Engine's labels | `engine.labels.operatingsystem==ubuntu-26.04` | `engine.labels` apply to Docker Engine labels like operating system, drivers, etc. Swarm administrators add `node.labels` for operational purposes by using diff --git a/data/cli/engine/docker_system_events.yaml b/data/cli/engine/docker_system_events.yaml index 89eed4c996eb..6bb8b516efba 100644 --- a/data/cli/engine/docker_system_events.yaml +++ b/data/cli/engine/docker_system_events.yaml @@ -374,8 +374,8 @@ examples: |- $ docker events --filter 'container=container_1' --filter 'container=container_2' - 2014-09-03T15:49:29.999999999Z07:00 container die 4386fb97867d (image=ubuntu:24.04) - 2014-05-10T17:42:14.999999999Z07:00 container stop 4386fb97867d (image=ubuntu:24.04) + 2014-09-03T15:49:29.999999999Z07:00 container die 4386fb97867d (image=ubuntu:26.04) + 2014-05-10T17:42:14.999999999Z07:00 container stop 4386fb97867d (image=ubuntu:26.04) 2014-05-10T17:42:14.999999999Z07:00 container die 7805c1d35632 (imager=redis:7.2) 2014-09-03T15:49:29.999999999Z07:00 container stop 7805c1d35632 (image=redis:7.2)