From 5a80662ab9e01e2fb7bcfc1032882f2c6434560f Mon Sep 17 00:00:00 2001 From: khs1994 Date: Sun, 21 Jan 2024 09:09:24 +0800 Subject: [PATCH] Sync from docker/docker.github.io@3774cfb by PCIT --- SUMMARY.md | 1 - content/build/exporters/_index.md | 2 +- content/engine/_index.md | 1 + content/engine/api/_index.md | 32 +++++----- content/engine/install/centos.md | 6 +- content/engine/install/debian.md | 6 +- content/engine/install/fedora.md | 8 +-- content/engine/install/raspberry-pi-os.md | 6 +- content/engine/install/rhel.md | 2 +- content/engine/install/sles.md | 6 +- content/engine/migration.md | 77 ----------------------- content/engine/security/rootless.md | 2 +- data/redirects.yml | 24 +++++-- 13 files changed, 54 insertions(+), 119 deletions(-) delete mode 100644 content/engine/migration.md diff --git a/SUMMARY.md b/SUMMARY.md index bf45bbbe4..ac36e4b36 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -899,7 +899,6 @@ * [Alternative Container Runtimes](content/engine/alternative-runtimes.md) * [Breaking Changes And Incompatibilities](content/engine/breaking_changes.md) * [Docker Frequently Asked Questions FAQ](content/engine/faq.md) - * [Migrate to Engine 1.10](content/engine/migration.md) - Faq - Admin * [FA Qs On Companies](content/faq/admin/company-faqs.md) diff --git a/content/build/exporters/_index.md b/content/build/exporters/_index.md index 7c8d3c776..0d9f926cf 100644 --- a/content/build/exporters/_index.md +++ b/content/build/exporters/_index.md @@ -20,7 +20,7 @@ Buildx supports the following exporters: [OCI image layout](https://github.com/opencontainers/image-spec/blob/v1.0.1/image-layout.md) format. - `docker`: exports the build result to the local filesystem in the - [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/v24.0.0/image/spec/v1.2.md) + [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/v25.0.0/image/spec/v1.2.md) format. - `cacheonly`: doesn't export a build output, but runs the build and creates a cache. diff --git a/content/engine/_index.md b/content/engine/_index.md index 5ae43b573..ca5f1c443 100644 --- a/content/engine/_index.md +++ b/content/engine/_index.md @@ -42,6 +42,7 @@ grid: aliases: - /edge/ - /engine/ce-ee-node-activate/ +- /engine/migration/ - /engine/misc/ - /linux/ --- diff --git a/content/engine/api/_index.md b/content/engine/api/_index.md index c00824755..a58126da2 100644 --- a/content/engine/api/_index.md +++ b/content/engine/api/_index.md @@ -73,22 +73,22 @@ To see the highest version of the API your Docker daemon and client support, use ```console $ docker version Client: Docker Engine - Community - Version: 24.0.0 - API version: 1.43 - Go version: go1.20.4 - Git commit: 98fdcd7 - Built: Mon May 15 18:48:45 2023 - OS/Arch: linux/arm64 + Version: 25.0.0 + API version: 1.44 + Go version: go1.21.6 + Git commit: e758fe5 + Built: Thu Jan 18 17:11:25 2024 + OS/Arch: linux/amd64 Context: default Server: Docker Engine - Community Engine: - Version: 24.0.0 - API version: 1.43 (minimum version 1.12) - Go version: go1.20.4 - Git commit: 1331b8c - Built: Mon May 15 18:48:45 2023 - OS/Arch: linux/arm64 + Version: 25.0.0 + API version: 1.44 (minimum version 1.24) + Go version: go1.21.6 + Git commit: 615dfdf + Built: Thu Jan 18 17:09:47 2024 + OS/Arch: linux/amd64 Experimental: false ... ``` @@ -99,14 +99,14 @@ You can specify the API version to use in any of the following ways: that incorporates the API version with the features you need. - When using `curl` directly, specify the version as the first part of the URL. For instance, if the endpoint is `/containers/` you can use - `/v1.42/containers/`. + `/v1.44/containers/`. - To force the Docker CLI or the Docker Engine SDKs to use an older version of the API than the version reported by `docker version`, set the environment variable `DOCKER_API_VERSION` to the correct version. This works on Linux, Windows, or macOS clients. ```console - $ DOCKER_API_VERSION='1.41' + $ DOCKER_API_VERSION='1.43' ``` While the environment variable is set, that version of the API is used, even @@ -158,5 +158,5 @@ API versions before v1.24 are [deprecated](/engine/deprecated/#deprecate-legacy- You can find archived documentation for deprecated versions of the API in the code repository on GitHub: -- [Documentation for API versions 1.23 and before](https://github.com/moby/moby/tree/v24.0.7/docs/api). -- [Documentation for API versions 1.6 and before](https://github.com/moby/moby/tree/v1.9.1/docs/reference/api). +- [Documentation for API versions 1.23 and before](https://github.com/moby/moby/tree/v25.0.0/docs/api). +- [Documentation for API versions 1.17 and before](https://github.com/moby/moby/tree/v1.9.1/docs/reference/api). diff --git a/content/engine/install/centos.md b/content/engine/install/centos.md index 5d5977238..88b034f06 100644 --- a/content/engine/install/centos.md +++ b/content/engine/install/centos.md @@ -118,8 +118,8 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce ```console $ yum list docker-ce --showduplicates | sort -r - docker-ce.x86_64 3:24.0.0-1.el8 docker-ce-stable - docker-ce.x86_64 3:23.0.6-1.el8 docker-ce-stable + docker-ce.x86_64 3:25.0.0-1.el8 docker-ce-stable + docker-ce.x86_64 3:24.0.7-1.el8 docker-ce-stable <...> ``` @@ -128,7 +128,7 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce Install a specific version by its fully qualified package name, which is the package name (`docker-ce`) plus the version string (2nd column), - separated by a hyphen (`-`). For example, `docker-ce-3:24.0.0-1.el8`. + separated by a hyphen (`-`). For example, `docker-ce-3:25.0.0-1.el8`. Replace `` with the desired version and then run the following command to install: diff --git a/content/engine/install/debian.md b/content/engine/install/debian.md index 2fc2ae482..c21bd8fb3 100644 --- a/content/engine/install/debian.md +++ b/content/engine/install/debian.md @@ -143,15 +143,15 @@ Docker from the repository. # List the available versions: $ apt-cache madison docker-ce | awk '{ print $3 }' - 5:24.0.0-1~debian.11~bullseye - 5:23.0.6-1~debian.11~bullseye + 5:25.0.0-1~debian.12~bookworm + 5:24.0.7-1~debian.12~bookworm ... ``` Select the desired version and install: ```console - $ VERSION_STRING=5:24.0.0-1~debian.11~bullseye + $ VERSION_STRING=5:25.0.0-1~debian.12~bookworm $ sudo apt-get install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin ``` diff --git a/content/engine/install/fedora.md b/content/engine/install/fedora.md index b5b041f08..af74b9a67 100644 --- a/content/engine/install/fedora.md +++ b/content/engine/install/fedora.md @@ -112,17 +112,17 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce ```console $ dnf list docker-ce --showduplicates | sort -r - docker-ce.x86_64 3:24.0.0-1.fc37 docker-ce-stable - docker-ce.x86_64 3:23.0.6-1.fc37 docker-ce-stable + docker-ce.x86_64 3:25.0.0-1.fc39 docker-ce-stable + docker-ce.x86_64 3:24.0.7-1.fc39 docker-ce-stable <...> ``` The list returned depends on which repositories are enabled, and is specific - to your version of Fedora (indicated by the `.fc37` suffix in this example). + to your version of Fedora (indicated by the `.fc39` suffix in this example). Install a specific version by its fully qualified package name, which is the package name (`docker-ce`) plus the version string (2nd column), - separated by a hyphen (`-`). For example, `docker-ce-3:24.0.0-1.fc37`. + separated by a hyphen (`-`). For example, `docker-ce-3:25.0.0-1.fc39`. Replace `` with the desired version and then run the following command to install: diff --git a/content/engine/install/raspberry-pi-os.md b/content/engine/install/raspberry-pi-os.md index 0cdccfd44..f84575e59 100644 --- a/content/engine/install/raspberry-pi-os.md +++ b/content/engine/install/raspberry-pi-os.md @@ -132,15 +132,15 @@ Docker from the repository. # List the available versions: $ apt-cache madison docker-ce | awk '{ print $3 }' - 5:24.0.0-1~raspbian.11~bullseye - 5:23.0.6-1~raspbian.11~bullseye + 5:25.0.0-1~raspbian.12~bookworm + 5:24.0.7-1~raspbian.12~bookworm ... ``` Select the desired version and install: ```console - $ VERSION_STRING=5:24.0.0-1~raspbian.11~bullseye + $ VERSION_STRING=5:25.0.0-1~raspbian.12~bookworm $ sudo apt-get install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin ``` diff --git a/content/engine/install/rhel.md b/content/engine/install/rhel.md index b93b31109..c8196af98 100644 --- a/content/engine/install/rhel.md +++ b/content/engine/install/rhel.md @@ -139,7 +139,7 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce Install a specific version by its fully qualified package name, which is the package name (`docker-ce`) plus the version string (2nd column), - separated by a hyphen (`-`). For example, `docker-ce-3:24.0.0-1.el8`. + separated by a hyphen (`-`). For example, `docker-ce-3:25.0.0-1.el8`. Replace `` with the desired version and then run the following command to install: diff --git a/content/engine/install/sles.md b/content/engine/install/sles.md index f0bc8c0e1..d6bd87a92 100644 --- a/content/engine/install/sles.md +++ b/content/engine/install/sles.md @@ -135,8 +135,8 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo ```console $ sudo zypper search -s --match-exact docker-ce | sort -r - v | docker-ce | package | 3:24.0.0-3 | s390x | Docker CE Stable - s390x - v | docker-ce | package | 3:23.0.6-3 | s390x | Docker CE Stable - s390x + v | docker-ce | package | 3:25.0.0-3 | s390x | Docker CE Stable - s390x + v | docker-ce | package | 3:24.0.7-3 | s390x | Docker CE Stable - s390x ``` The list returned depends on which repositories are enabled, and is specific @@ -144,7 +144,7 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo Install a specific version by its fully qualified package name, which is the package name (`docker-ce`) plus the version string (2nd column), - separated by a hyphen (`-`). For example, `docker-ce-3:24.0.0`. + separated by a hyphen (`-`). For example, `docker-ce-3:25.0.0`. Replace `` with the desired version and then run the following command to install: diff --git a/content/engine/migration.md b/content/engine/migration.md deleted file mode 100644 index c94aead21..000000000 --- a/content/engine/migration.md +++ /dev/null @@ -1,77 +0,0 @@ ---- -description: Migrate to Engine 1.10 -keywords: docker, documentation, engine, upgrade, migration -title: Migrate to Engine 1.10 ---- - -Starting from version 1.10 of Docker Engine, we completely change the way image -data is addressed on disk. Previously, every image and layer used a randomly -assigned UUID. In 1.10 we implemented a content addressable method using an ID, -based on a secure hash of the image and layer data. - -The new method gives users more security, provides a built-in way to avoid ID -collisions and guarantee data integrity after pull, push, load, or save. It also -brings better sharing of layers by allowing many images to freely share their -layers even if they didn’t come from the same build. - -Addressing images by their content also lets us more easily detect if something -has already been downloaded. Because we have separated images and layers, you -don’t need to pull the configurations for every image that was part of the -original build chain. We also don’t need to create layers for the build -instructions that didn’t modify the filesystem. - -Content addressability is the foundation for the new distribution features. The -image pull and push code has been reworked to use a download/upload manager -concept that makes pushing and pulling images much more stable and mitigates any -parallel request issues. The download manager also brings retries on failed -downloads and better prioritization for concurrent downloads. - -We are also introducing a new manifest format that is built on top of the -content addressable base. It directly references the content addressable image -configuration and layer checksums. The new manifest format also makes it -possible for a manifest list to be used for targeting multiple -architectures/platforms. Moving to the new manifest format is completely -transparent. - -## Prepare for upgrade - -To make your current images accessible to the new model we need to migrate them -to content addressable storage. This means calculating the secure checksums for -your current data. - -All your current images, tags, and containers are automatically migrated to the -new foundation the first time you start Docker Engine 1.10. Before loading your -container, the daemon calculates all needed checksums for your current data, -and after it has completed, all your images and tags have brand new secure -IDs. - -**While this is simple operation, calculating SHA256 checksums for your files -can take time if you have lots of image data.** On average you should assume -that migrator can process data at a speed of 100MB/s. During this time your -Docker daemon won’t be ready to respond to requests. - -## Minimize migration time - -If you can accept this one time hit, then upgrading Docker Engine and restarting -the daemon transparently migrates your images. However, if you want to -minimize the daemon’s downtime, a migration utility can be run while your old -daemon is still running. - -This tool finds all your current images and calculate the checksums for -them. After you upgrade and restart the daemon, the checksum data of the -migrated images already exist, freeing the daemon from that computation -work. If new images appeared between the migration and the upgrade, those are -processed at time of upgrade to 1.10. - -[You can download the migration tool -here.](https://github.com/docker/v1.10-migrator/releases) - -The migration tool can also be run as a Docker image. While running the migrator -image you need to expose your Docker data directory to the container. If you use -the default path then you would run: - - $ docker run --rm -v /var/lib/docker:/var/lib/docker docker/v1.10-migrator - -If you use the -devicemapper storage driver, you also need to pass the flag `--privileged` to -give the tool access to your storage devices. \ No newline at end of file diff --git a/content/engine/security/rootless.md b/content/engine/security/rootless.md index 57a534299..31e08dc83 100644 --- a/content/engine/security/rootless.md +++ b/content/engine/security/rootless.md @@ -292,7 +292,7 @@ To run Rootless Docker inside "rootful" Docker, use the `docker:-dind-r image instead of `docker:-dind`. ```console -$ docker run -d --name dind-rootless --privileged docker:24.0-dind-rootless +$ docker run -d --name dind-rootless --privileged docker:25.0-dind-rootless ``` The `docker:-dind-rootless` image runs as a non-root user (UID 1000). diff --git a/data/redirects.yml b/data/redirects.yml index 6c850c7c5..7efbe7a16 100644 --- a/data/redirects.yml +++ b/data/redirects.yml @@ -86,12 +86,24 @@ "/desktop/mac/apple-silicon/": - /go/apple-silicon/ "/engine/api/#deprecated-api-versions": - - /engine/api/v1.23/ - - /engine/api/v1.22/ - - /engine/api/v1.21/ - - /engine/api/v1.20/ - - /engine/api/v1.19/ - /engine/api/v1.18/ + - /engine/api/v1.19/ + - /engine/api/v1.20/ + - /engine/api/v1.21/ + - /engine/api/v1.22/ + - /engine/api/v1.23/ + - /engine/reference/api/docker_remote_api_v1.18/ + - /engine/reference/api/docker_remote_api_v1.19/ + - /engine/reference/api/docker_remote_api_v1.20/ + - /engine/reference/api/docker_remote_api_v1.21/ + - /engine/reference/api/docker_remote_api_v1.22/ + - /engine/reference/api/docker_remote_api_v1.23/ + - /reference/api/docker_remote_api_v1.18/ + - /reference/api/docker_remote_api_v1.19/ + - /reference/api/docker_remote_api_v1.20/ + - /reference/api/docker_remote_api_v1.21/ + - /reference/api/docker_remote_api_v1.22/ + - /reference/api/docker_remote_api_v1.23/ "/engine/security/#docker-daemon-attack-surface": # Details about the "Docker Daemon attack surface". This redirect is currently @@ -103,7 +115,7 @@ # used in warnings printed by the Docker Engine when pulling deprecated image # formats: # - # - Docker Image Specification v1.0.0 (https://github.com/moby/moby/blob/v24.0.0/image/spec/v1.md) + # - Docker Image Specification v1.0.0 (https://github.com/moby/moby/blob/v25.0.0/image/spec/v1.md) # - Docker Image manifest version 2, schema 1 (https://github.com/distribution/distribution/blob/ff2bce27319a0a0bca924820c353fae3b9046e91/docs/spec/manifest-v2-1.md) # # TODO(thaJeztah) We need a better page describing the image formats (and deprecated ones)