From 95c850fcb150108748ed3ac46a27fb29eee5a48f Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Mon, 28 Jan 2019 14:24:18 -0800 Subject: [PATCH] update install instructions of latest docker-ee to include containerd Signed-off-by: Andrew Hsu --- _includes/ee-linux-install-reuse.md | 4 ++-- install/linux/docker-ee/suse.md | 6 +++--- install/linux/docker-ee/ubuntu.md | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/_includes/ee-linux-install-reuse.md b/_includes/ee-linux-install-reuse.md index 695196bfc6..12f9b20642 100644 --- a/_includes/ee-linux-install-reuse.md +++ b/_includes/ee-linux-install-reuse.md @@ -145,7 +145,7 @@ You only need to set up the repository once, after which you can install Docker 1. Install the latest patch release, or go to the next step to install a specific version: ```bash - $ sudo yum -y install docker-ee + $ sudo yum -y install docker-ee containerd.io ``` If prompted to accept the GPG key, verify that the fingerprint matches `{{ gpg-fingerprint }}`, and if so, accept it. @@ -166,7 +166,7 @@ You only need to set up the repository once, after which you can install Docker b. Install a specific version by its **fully qualified package name** which is the package name (`docker-ee`) plus the version string (2nd column) up to the hyphen, for example: `docker-ee-18.09.0` ```bash - $ sudo yum -y install + $ sudo yum -y install containerd.io ``` For example, if you want to install the 18.09 version run the following: diff --git a/install/linux/docker-ee/suse.md b/install/linux/docker-ee/suse.md index f4f0aa6e6c..71e2ee46ba 100644 --- a/install/linux/docker-ee/suse.md +++ b/install/linux/docker-ee/suse.md @@ -222,11 +222,11 @@ from the repository. `77FE DA13 1A83 1D29 A418 D3E8 99E5 FF2E 7668 2BC9` and if so, accept the key. -2. Install the latest version of Docker EE, or go to the next step to install a +2. Install the latest version of Docker EE and containerd, or go to the next step to install a specific version. ```bash - $ sudo zypper install docker-ee + $ sudo zypper install docker-ee containerd.io ``` Start Docker: @@ -259,7 +259,7 @@ from the repository. and separate them by a hyphen (`-`): ```bash - $ sudo zypper install docker-ee- + $ sudo zypper install docker-ee- containerd.io ``` Docker is installed but not started. The `docker` group is created, but no diff --git a/install/linux/docker-ee/ubuntu.md b/install/linux/docker-ee/ubuntu.md index ff73108186..a99a67e062 100644 --- a/install/linux/docker-ee/ubuntu.md +++ b/install/linux/docker-ee/ubuntu.md @@ -191,10 +191,10 @@ from the repository. 2. Install the latest version of Docker EE, or go to the next step to install a specific version. Any existing installation of Docker EE is replaced. - Use this command to install the latest version of Docker EE: + Use this command to install the latest version of Docker EE and containerd: ```bash - $ sudo apt-get install docker-ee + $ sudo apt-get install docker-ee containerd.io ``` > **Warning**: If you have multiple Docker repositories enabled, installing @@ -222,7 +222,7 @@ from the repository. version string to the package name and separate them by an equals sign (`=`): ```bash - $ sudo apt-get install docker-ee= + $ sudo apt-get install docker-ee= containerd.io ``` The Docker daemon starts automatically.