Skip to content

Commit

Permalink
Sync from docker/docs@3774cfb by PCIT
Browse files Browse the repository at this point in the history
  • Loading branch information
khs1994 committed Jan 21, 2024
1 parent c9c2239 commit 5a80662
Show file tree
Hide file tree
Showing 13 changed files with 54 additions and 119 deletions.
1 change: 0 additions & 1 deletion SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion content/build/exporters/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions content/engine/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ grid:
aliases:
- /edge/
- /engine/ce-ee-node-activate/
- /engine/migration/
- /engine/misc/
- /linux/
---
Expand Down
32 changes: 16 additions & 16 deletions content/engine/api/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
...
```
Expand All @@ -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
Expand Down Expand Up @@ -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).
6 changes: 3 additions & 3 deletions content/engine/install/centos.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
<...>
```

Expand All @@ -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 `<VERSION_STRING>` with the desired version and then run the following
command to install:
Expand Down
6 changes: 3 additions & 3 deletions content/engine/install/debian.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
8 changes: 4 additions & 4 deletions content/engine/install/fedora.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `<VERSION_STRING>` with the desired version and then run the following
command to install:
Expand Down
6 changes: 3 additions & 3 deletions content/engine/install/raspberry-pi-os.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion content/engine/install/rhel.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `<VERSION_STRING>` with the desired version and then run the following
command to install:
Expand Down
6 changes: 3 additions & 3 deletions content/engine/install/sles.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,16 @@ $ 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
to your version of SLES.

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 `<VERSION_STRING>` with the desired version and then run the following
command to install:
Expand Down
77 changes: 0 additions & 77 deletions content/engine/migration.md

This file was deleted.

2 changes: 1 addition & 1 deletion content/engine/security/rootless.md
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ To run Rootless Docker inside "rootful" Docker, use the `docker:<version>-dind-r
image instead of `docker:<version>-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:<version>-dind-rootless` image runs as a non-root user (UID 1000).
Expand Down
24 changes: 18 additions & 6 deletions data/redirects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit 5a80662

Please sign in to comment.