Skip to content

Commit e7e5f0c

Browse files
tmoschoutmoschou
committed
Remove some tabs on container-runtimes.md docs
This simplifies the containerd installation instructions. All Linux distros will now download from Docker repos, including Ubuntu 18.04 which previously installed from Ubuntu repos. The Docker runtime instructions have also been simplified. The RHEL/CentOS specific option overlay2.override_kernel_check=true option has been removed. It seems Docker will now autodetect overlay2 support on older Linux kernels <4.0.0,>=3.10.0-514, which have back-ported overlay2 support on RHEL/CentOS 7.4+ See moby/moby#34368
1 parent b1686cc commit e7e5f0c

File tree

1 file changed

+14
-164
lines changed

1 file changed

+14
-164
lines changed

‎content/en/docs/setup/production-environment/container-runtimes.md

Lines changed: 14 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -92,37 +92,9 @@ sudo sysctl --system
9292
Install containerd:
9393

9494
{{< tabs name="tab-cri-containerd-installation" >}}
95-
{{% tab name="Ubuntu 16.04" %}}
95+
{{% tab name="Linux" %}}
9696

97-
1. Setup the [Docker Engine repository for Ubuntu](https://docs.docker.com/engine/install/ubuntu/#set-up-the-repository)
98-
99-
2. Install containerd:
100-
101-
```shell
102-
sudo apt-get update && sudo apt-get install -y containerd.io
103-
```
104-
105-
3. Configure containerd:
106-
107-
```shell
108-
sudo mkdir -p /etc/containerd
109-
containerd config default | sudo tee /etc/containerd/config.toml
110-
```
111-
112-
4. Restart containerd:
113-
114-
```shell
115-
sudo systemctl restart containerd
116-
```
117-
118-
{{% /tab %}}
119-
{{% tab name="Ubuntu 18.04/20.04" %}}
120-
121-
1. Install containerd:
122-
123-
```shell
124-
sudo apt-get update && sudo apt-get install -y containerd
125-
```
97+
1. Install the `containerd.io` package from the official Docker repositories. Instructions for setting up the Docker repository for your respective Linux distribution and installing the `containerd.io` package can be found at [Install Docker Engine](https://docs.docker.com/engine/install/#server).
12698

12799
2. Configure containerd:
128100

@@ -137,60 +109,10 @@ Install containerd:
137109
sudo systemctl restart containerd
138110
```
139111

140-
{{% /tab %}}
141-
{{% tab name="Debian 9+" %}}
142-
143-
1. Setup the [Docker Engine repository for Debian](https://docs.docker.com/engine/install/debian/#set-up-the-repository)
144-
145-
2. Install containerd:
146-
147-
```shell
148-
sudo apt-get update && sudo apt-get install -y containerd.io
149-
```
150-
151-
3. Configure containerd:
152-
153-
```shell
154-
sudo mkdir -p /etc/containerd
155-
containerd config default | sudo tee /etc/containerd/config.toml
156-
```
157-
158-
4. Restart containerd:
159-
160-
```shell
161-
sudo systemctl restart containerd
162-
```
163-
164-
{{% /tab %}}
165-
{{% tab name="CentOS/RHEL 7.4+" %}}
166-
167-
1. Setup the [Docker Engine repository for CentOS/RHEL](https://docs.docker.com/engine/install/centos/#set-up-the-repository)
168-
169-
2. Install containerd:
170-
171-
```shell
172-
sudo yum update -y && sudo yum install -y containerd.io
173-
```
174-
175-
3. Configure containerd:
176-
177-
```shell
178-
sudo mkdir -p /etc/containerd
179-
containerd config default | sudo tee /etc/containerd/config.toml
180-
```
181-
182-
4. Restart containerd:
183-
184-
```shell
185-
sudo systemctl restart containerd
186-
```
187-
188112
{{% /tab %}}
189113
{{% tab name="Windows (PowerShell)" %}}
190114

191-
<br />
192115
Start a Powershell session, set `$Version` to the desired version (ex: `$Version=1.4.3`), and then run the following commands:
193-
<br />
194116

195117
1. Download containerd:
196118

@@ -425,28 +347,9 @@ in sync.
425347

426348
### Docker
427349

428-
On each of your nodes, install Docker CE.
429-
430-
The Kubernetes release notes list which versions of Docker are compatible
431-
with that version of Kubernetes.
432-
433-
Use the following commands to install Docker on your system:
434-
435-
{{< tabs name="tab-cri-docker-installation" >}}
436-
{{% tab name="Ubuntu 16.04+" %}}
437-
438-
1. Setup the [Docker Engine repository for Ubuntu](https://docs.docker.com/engine/install/ubuntu/#set-up-the-repository)
350+
1. On each of your nodes, install the Docker for your Linux distribution as per [Install Docker Engine](https://docs.docker.com/engine/install/#server)
439351

440-
2. Install Docker CE:
441-
442-
```shell
443-
sudo apt-get update && sudo apt-get install -y \
444-
containerd.io=1.2.13-2 \
445-
docker-ce=5:19.03.11~3-0~ubuntu-$(lsb_release -cs) \
446-
docker-ce-cli=5:19.03.11~3-0~ubuntu-$(lsb_release -cs)
447-
```
448-
449-
3. Set up the Docker daemon:
352+
2. Configure the Docker daemon, in particular to use systemd for the management of the container’s cgroups.
450353

451354
```shell
452355
sudo mkdir /etc/docker
@@ -462,73 +365,20 @@ Use the following commands to install Docker on your system:
462365
EOF
463366
```
464367
465-
4. Create `/etc/systemd/system/docker.service.d`:
466-
467-
```shell
468-
sudo mkdir -p /etc/systemd/system/docker.service.d
469-
```
368+
{{< note >}}
369+
`overlay2` is the preferred storage driver for systems running Linux kernel version 4.0 or higher, or RHEL or CentOS using version 3.10.0-514 and above.
370+
{{< /note >}}
470371
471-
5. Restart Docker:
372+
3. Restart Docker and enable on boot:
472373
473374
```shell
375+
sudo systemctl enable docker
474376
sudo systemctl daemon-reload
475377
sudo systemctl restart docker
476378
```
477379
478-
{{% /tab %}}
479-
{{% tab name="CentOS/RHEL 7.4+" %}}
480-
481-
1. Setup the [Docker Engine repository for CentOS/RHEL](https://docs.docker.com/engine/install/centos/#set-up-the-repository)
482-
483-
2. Install Docker CE:
484-
485-
```shell
486-
sudo yum update -y && sudo yum install -y \
487-
containerd.io-1.2.13 \
488-
docker-ce-19.03.11 \
489-
docker-ce-cli-19.03.11
490-
```
491-
492-
3. Set up the Docker daemon:
493-
494-
```shell
495-
sudo mkdir /etc/docker
496-
cat <<EOF | sudo tee /etc/docker/daemon.json
497-
{
498-
"exec-opts": ["native.cgroupdriver=systemd"],
499-
"log-driver": "json-file",
500-
"log-opts": {
501-
"max-size": "100m"
502-
},
503-
"storage-driver": "overlay2",
504-
"storage-opts": [
505-
"overlay2.override_kernel_check=true"
506-
]
507-
}
508-
EOF
509-
```
510-
511-
4. Create `/etc/systemd/system/docker.service.d`:
512-
513-
```shell
514-
sudo mkdir -p /etc/systemd/system/docker.service.d
515-
```
516-
517-
5. Restart Docker:
518-
519-
```shell
520-
sudo systemctl daemon-reload
521-
sudo systemctl restart docker
522-
```
523-
524-
{{% /tab %}}
525-
{{< /tabs >}}
526-
527-
If you want the `docker` service to start on boot, run the following command:
528-
529-
```shell
530-
sudo systemctl enable docker
531-
```
532-
533-
Refer to the [official Docker installation guides](https://docs.docker.com/engine/installation/)
534-
for more information.
380+
{{< note >}}
381+
For more information refer to
382+
- [Configure the Docker daemon](https://docs.docker.com/config/daemon/)
383+
- [Control Docker with systemd](https://docs.docker.com/config/daemon/systemd/)
384+
{{< /note >}}

0 commit comments

Comments
 (0)