From 587f6cee63ff4c23e7ca286cffc934457e412271 Mon Sep 17 00:00:00 2001 From: clearbjli Date: Tue, 27 Oct 2020 13:11:00 +0100 Subject: [PATCH 1/2] Update container-runtimes.md --keyring option to apt-key must come before the "add" command. Otherwise this step will fail (verified on Ubuntu 20.04.1 LTS). --- .../en/docs/setup/production-environment/container-runtimes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/setup/production-environment/container-runtimes.md b/content/en/docs/setup/production-environment/container-runtimes.md index ae67726b8e..ffc5d12293 100644 --- a/content/en/docs/setup/production-environment/container-runtimes.md +++ b/content/en/docs/setup/production-environment/container-runtimes.md @@ -102,7 +102,7 @@ sudo apt-get update && sudo apt-get install -y apt-transport-https ca-certificat ```shell ## Add Docker's official GPG key -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add --keyring /etc/apt/trusted.gpg.d/docker.gpg - +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key --keyring /etc/apt/trusted.gpg.d/docker.gpg add - ``` ```shell From 4adea80ff8df94163796e80f68bcd1ec1b61334c Mon Sep 17 00:00:00 2001 From: Michael Hofer Date: Thu, 29 Oct 2020 10:58:05 +0100 Subject: [PATCH 2/2] Docs: Add containerd setup instructions for Ubuntu 18.04/20.04 --- .../container-runtimes.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/content/en/docs/setup/production-environment/container-runtimes.md b/content/en/docs/setup/production-environment/container-runtimes.md index ffc5d12293..5f408161fc 100644 --- a/content/en/docs/setup/production-environment/container-runtimes.md +++ b/content/en/docs/setup/production-environment/container-runtimes.md @@ -124,6 +124,24 @@ sudo mkdir -p /etc/containerd sudo containerd config default > /etc/containerd/config.toml ``` +```shell +# Restart containerd +sudo systemctl restart containerd +``` +{{% /tab %}} +{{% tab name="Ubuntu 18.04/20.04" %}} + +```shell +# (Install containerd) +sudo apt-get update && sudo apt-get install -y containerd +``` + +```shell +# Configure containerd +sudo mkdir -p /etc/containerd +sudo containerd config default > /etc/containerd/config.toml +``` + ```shell # Restart containerd sudo systemctl restart containerd