Skip to content

Commit 0dd4822

Browse files
ArthurFlagArthurFlag
committed
tweaks
1 parent 00b0bf4 commit 0dd4822

File tree

8 files changed

+64
-47
lines changed

8 files changed

+64
-47
lines changed

‎content/manuals/engine/_index.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,16 @@ aliases:
5151
- /linux/
5252
---
5353

54-
Docker Engine is an open source containerization technology for building and containerizing your applications. Docker Engine acts as a client-server application with:
54+
Docker Engine is an open source containerization technology for building and
55+
containerizing your applications. Docker Engine acts as a client-server
56+
application with:
5557

56-
- A server with a long-running daemon process [`dockerd`](/reference/cli/dockerd)
57-
- APIs that specify interfaces that programs can use to talk to and instruct the Docker daemon
58-
- A command line interface (CLI) client [`docker`](/reference/cli/docker/)
58+
- A server with a long-running daemon process
59+
[`dockerd`](/reference/cli/dockerd).
60+
- APIs which specify interfaces that programs can use to talk to and instruct
61+
the Docker daemon.
62+
- A command line interface (CLI) client
63+
[`docker`](/reference/cli/docker/).
5964

6065
The CLI uses [Docker APIs](/reference/api/engine/_index.md) to control or interact with the Docker
6166
daemon through scripting or direct CLI commands. Many other Docker applications

‎content/manuals/engine/install/_index.md‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,24 +72,32 @@ Docker provides [binaries](binaries.md) for manual installation. These binaries
7272

7373
Docker Engine has two update channels: **stable** and **test**.
7474

75-
- The **stable** channel gives you the latest versions released for general availability.
76-
- The **test** channel gives you pre-release versions that are ready for testing before general availability.
75+
* The **stable** channel gives you the latest versions released for general availability.
76+
* The **test** channel gives you pre-release versions that are ready for testing before
77+
general availability.
7778

78-
Use the test channel with caution. Pre-release versions include experimental and early-access features that are subject to breaking changes.
79+
Use the test channel with caution. Pre-release versions include experimental and
80+
early-access features that are subject to breaking changes.
7981

8082
## Support
8183

82-
Docker Engine is an open source project, supported by the Moby project maintainers and community members. Docker doesn't provide support for Docker Engine. Docker provides support for Docker products, including Docker Desktop, which uses Docker Engine as one of its components.
84+
Docker Engine is an open source project, supported by the Moby project maintainers
85+
and community members. Docker doesn't provide support for Docker Engine.
86+
Docker provides support for Docker products, including Docker Desktop, which uses
87+
Docker Engine as one of its components.
8388

84-
For information about the open source project, refer to the [Moby project website](https://mobyproject.org/).
89+
For information about the open source project, refer to the
90+
[Moby project website](https://mobyproject.org/).
8591

8692
### Upgrade path
8793

8894
Patch releases are always backward compatible with their major and minor version.
8995

9096
### Licensing
9197

92-
Docker Engine is licensed under the Apache License, Version 2.0. See [LICENSE](https://github.com/moby/moby/blob/master/LICENSE) for the full license text.
98+
Docker Engine is licensed under the Apache License, Version 2.0. See
99+
[LICENSE](https://github.com/moby/moby/blob/master/LICENSE) for the full
100+
license text.
93101

94102
## Reporting security issues
95103

@@ -101,4 +109,5 @@ Docker appreciates security reports and will publicly thank you for your contrib
101109

102110
## Get started
103111

104-
After setting up Docker, you can learn the basics with [Getting started with Docker](/get-started/introduction/_index.md).
112+
After setting up Docker, you can learn the basics with
113+
[Getting started with Docker](/get-started/introduction/_index.md).

‎content/manuals/engine/install/centos.md‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,9 @@ CentOS versions:
3737
3838
### Uninstall old versions
3939

40-
Before you install Docker Engine, uninstall any conflicting packages.
41-
42-
Your Linux distribution may provide unofficial Docker packages, which can
43-
conflict with the official packages provided by Docker. Uninstall these packages
44-
before installing the official version.
40+
Uninstall unofficial or conflicting Docker packages provided
41+
by your Linux distribution before installing Docker Engine.
42+
Remove the following packages if present:
4543

4644
```console
4745
$ sudo dnf remove docker \
@@ -83,10 +81,12 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
8381

8482
#### Install Docker Engine
8583

86-
{{< tabs >}}
87-
{{< tab name="Latest" >}}
84+
1. Install the Docker packages.
85+
86+
{{< tabs >}}
87+
{{< tab name="Latest" >}}
8888

89-
To install the latest version:
89+
To install the latest version, run:
9090

9191
```console
9292
$ sudo dnf install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
@@ -112,19 +112,22 @@ To install the latest version:
112112
<...>
113113
```
114114

115-
The list depends on which repositories are enabled and your CentOS version (see the `.el9` suffix).
115+
The list returned depends on which repositories are enabled, and is specific
116+
to your version of CentOS (indicated by the `.el9` suffix in this example).
116117

117118
Install a specific version by its fully qualified package name, which is
118119
the package name (`docker-ce`) plus the version string (2nd column),
119120
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}-1.el9`.
120121

121-
Replace `<VERSION_STRING>` with the desired version and run:
122+
Replace `<VERSION_STRING>` with the desired version and then run the following
123+
command to install:
122124

123125
```console
124126
$ sudo dnf install docker-ce-<VERSION_STRING> docker-ce-cli-<VERSION_STRING> containerd.io docker-buildx-plugin docker-compose-plugin
125127
```
126128

127-
This installs Docker, but does not start it. It also creates a `docker` group, but does not add users to the group by default.
129+
This command installs Docker, but it doesn't start Docker. It also creates a
130+
`docker` group, however, it doesn't add any users to the group by default.
128131

129132
{{< /tab >}}
130133
{{< /tabs >}}

‎content/manuals/engine/install/debian.md‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,17 @@ To get started with Docker Engine on Debian, make sure you
2222

2323
### Firewall limitations
2424

25-
When exposing container ports with Docker, these ports bypass `ufw` or `firewalld` rules.
26-
See [Docker and ufw](/manuals/engine/network/packet-filtering-firewalls.md#docker-and-ufw) for details.
27-
Docker supports only `iptables-nft` and `iptables-legacy`.
28-
Rules created with `nft` are not supported on a system with Docker installed.
29-
Use `iptables` or `ip6tables` and add rules to the `DOCKER-USER` chain.
30-
See [Packet filtering and firewalls](/manuals/engine/network/packet-filtering-firewalls.md).
25+
> [!WARNING]
26+
>
27+
> Before you install Docker, make sure you consider the following
28+
> security implications and firewall incompatibilities.
29+
30+
- When exposing container ports with Docker, these ports bypass `ufw` or `firewalld` rules.
31+
See [Docker and ufw](/manuals/engine/network/packet-filtering-firewalls.md#docker-and-ufw) for details.
32+
- Docker supports only `iptables-nft` and `iptables-legacy`.
33+
Rules created with `nft` are not supported on a system with Docker installed.
34+
Use `iptables` or `ip6tables` and add rules to the `DOCKER-USER` chain.
35+
See [Packet filtering and firewalls](/manuals/engine/network/packet-filtering-firewalls.md).
3136

3237
### OS requirements
3338

@@ -42,7 +47,8 @@ and ppc64le (ppc64el) architectures.
4247

4348
### Uninstall old versions
4449

45-
Uninstall unofficial or conflicting Docker packages before installing Docker Engine.
50+
Uninstall unofficial or conflicting Docker packages provided
51+
by your Linux distribution before installing Docker Engine.
4652
Remove the following packages if present:
4753

4854
- `docker.io`

‎content/manuals/engine/install/fedora.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ Docker Engine requires a maintained version of Fedora:
3131

3232
### Uninstall old versions
3333

34-
Uninstall unofficial or conflicting Docker packages before installing Docker Engine.
34+
Uninstall unofficial or conflicting Docker packages provided
35+
by your Linux distribution before installing Docker Engine.
3536
Remove the following packages if present:
3637

3738
```console

‎content/manuals/engine/install/raspberry-pi-os.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ To install Docker Engine, you need one of the following OS versions:
5151

5252
### Uninstall old versions
5353

54-
Before you can install Docker Engine, you need to uninstall any conflicting packages.
55-
56-
Your Linux distribution may provide unofficial Docker packages, which may conflict
57-
with the official packages provided by Docker. You must uninstall these packages
58-
before you install the official version of Docker Engine.
54+
Uninstall unofficial or conflicting Docker packages provided
55+
by your Linux distribution before installing Docker Engine.
56+
Remove the following packages if present:
5957

6058
The unofficial packages to uninstall are:
6159

@@ -132,7 +130,7 @@ Docker from the repository.
132130
```console
133131
$ sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
134132
```
135-
133+
136134
{{< /tab >}}
137135
{{< tab name="Specific version" >}}
138136

‎content/manuals/engine/install/rhel.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ Docker Engine requires a maintained version of RHEL:
3434

3535
### Uninstall old versions
3636

37-
Before you can install Docker Engine, you need to uninstall any conflicting packages.
38-
39-
Your Linux distribution may provide unofficial Docker packages, which may conflict
40-
with the official packages provided by Docker. You must uninstall these packages
41-
before you install the official version of Docker Engine.
37+
Uninstall unofficial or conflicting Docker packages provided
38+
by your Linux distribution before installing Docker Engine.
39+
Remove the following packages if present:
4240

4341
```console
4442
$ sudo dnf remove docker \

‎content/manuals/engine/install/sles.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ $ sudo zypper addrepo $opensuse_repo
5151

5252
### Uninstall old versions
5353

54-
Uninstall any conflicting packages before you install Docker Engine.
55-
56-
Your Linux distribution may provide unofficial Docker packages, which may conflict
57-
with the official packages provided by Docker. You must uninstall these packages
58-
before you install the official version of Docker Engine.
54+
Uninstall unofficial or conflicting Docker packages provided
55+
by your Linux distribution before installing Docker Engine.
56+
Remove the following packages if present:
5957

6058
```console
6159
$ sudo zypper remove docker \
@@ -132,7 +130,6 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo
132130

133131
```console
134132
$ sudo zypper search -s --match-exact docker-ce | sort -r
135-
136133
v | docker-ce | package | 3:{{% param "docker_ce_version" %}}-1 | s390x | Docker CE Stable - s390x
137134
v | docker-ce | package | 3:{{% param "docker_ce_version_prev" %}}-1 | s390x | Docker CE Stable - s390x
138135
```

0 commit comments

Comments
 (0)