Update Docker installation instructions (#17405)

This commit is contained in:
Ciprian Hacman
2019-11-05 00:24:11 +02:00
committed by Bob Killen
parent 012a41a5fc
commit 703b2658c2
@@ -64,17 +64,18 @@ is to drain the Node from its workloads, remove it from the cluster and re-join
## Docker ## Docker
On each of your machines, install Docker. On each of your machines, install Docker.
Version 18.06.2 is recommended, but 1.11, 1.12, 1.13, 17.03 and 18.09 are known to work as well. Version 19.03.4 is recommended, but 1.13.1, 17.03, 17.06, 17.09, 18.06 and 18.09 are known to work as well.
Keep track of the latest verified Docker version in the Kubernetes release notes. Keep track of the latest verified Docker version in the Kubernetes release notes.
Use the following commands to install Docker on your system: Use the following commands to install Docker on your system:
{{< tabs name="tab-cri-docker-installation" >}} {{< tabs name="tab-cri-docker-installation" >}}
{{< tab name="Ubuntu 16.04" codelang="bash" >}} {{< tab name="Ubuntu 16.04+" codelang="bash" >}}
# Install Docker CE # Install Docker CE
## Set up the repository: ## Set up the repository:
### Install packages to allow apt to use a repository over HTTPS ### Install packages to allow apt to use a repository over HTTPS
apt-get update && apt-get install apt-transport-https ca-certificates curl software-properties-common apt-get update && apt-get install \
apt-transport-https ca-certificates curl software-properties-common
### Add Dockers official GPG key ### Add Dockers official GPG key
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
@@ -86,7 +87,9 @@ add-apt-repository \
stable" stable"
## Install Docker CE. ## Install Docker CE.
apt-get update && apt-get install docker-ce=18.06.2~ce~3-0~ubuntu apt-get update && apt-get install \
docker-ce=5:19.03.* \
docker-ce-cli=5:19.03.*
# Setup daemon. # Setup daemon.
cat > /etc/docker/daemon.json <<EOF cat > /etc/docker/daemon.json <<EOF
@@ -114,12 +117,14 @@ systemctl restart docker
yum install yum-utils device-mapper-persistent-data lvm2 yum install yum-utils device-mapper-persistent-data lvm2
### Add Docker repository. ### Add Docker repository.
yum-config-manager \ yum-config-manager --add-repo \
--add-repo \
https://download.docker.com/linux/centos/docker-ce.repo https://download.docker.com/linux/centos/docker-ce.repo
## Install Docker CE. ## Install Docker CE.
yum update && yum install docker-ce-18.06.2.ce yum update && yum install \
containerd.io-1.2.10 \
docker-ce-19.03.4 \
docker-ce-cli-19.03.4
## Create /etc/docker directory. ## Create /etc/docker directory.
mkdir /etc/docker mkdir /etc/docker