From acf56251d50ca1d9fa1788b379df8c05dbabafe8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Fri, 8 Mar 2019 21:07:13 +0100 Subject: [PATCH] Change Docker requirements for Kubernetes --- .../en/installation/requirements/_index.md | 8 +++- content/rke/v0.1.x/en/os/_index.md | 39 ++++++------------- 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/content/rancher/v2.x/en/installation/requirements/_index.md b/content/rancher/v2.x/en/installation/requirements/_index.md index c7be7a3b0ea..67616fb160d 100644 --- a/content/rancher/v2.x/en/installation/requirements/_index.md +++ b/content/rancher/v2.x/en/installation/requirements/_index.md @@ -22,7 +22,13 @@ Rancher is supported on the following operating systems and their subsequent non * Docker 17.06 If you are using RancherOS, make sure you switch the Docker engine to a supported version using:
-`sudo ros engine switch docker-17.03.2-ce` +``` +# Look up available versions +sudo ros engine list + +# Switch to a supported version +sudo ros engine switch docker-18.09.2 +``` [Docker Documentation: Installation Instructions](https://docs.docker.com/) diff --git a/content/rke/v0.1.x/en/os/_index.md b/content/rke/v0.1.x/en/os/_index.md index d14ffbd0b25..404f71afb29 100644 --- a/content/rke/v0.1.x/en/os/_index.md +++ b/content/rke/v0.1.x/en/os/_index.md @@ -153,40 +153,25 @@ By default, Atomic hosts do not come with a Docker group. You can update the own - Docker - Each Kubernetes version supports different Docker versions. -Kubernetes Version | Docker 1.12.6 | Docker 1.13.1 | Docker 17.03.2 | -----|----|----|----| -v1.11.x | X | X | X | -v1.10.x | X | X | X | -v1.9.x | X | X | X | +Kubernetes Version | Supported Docker version(s) | +----|----| +v1.13.x | RHEL Docker 1.13, 17.03.2, 18.06.2, 18.09.2 | +v1.12.x | RHEL Docker 1.13, 17.03.2, 18.06.2, 18.09.2 | +v1.11.x | RHEL Docker 1.13, 17.03.2, 18.06.2, 18.09.2 | -You can either follow the [Docker installation](https://docs.docker.com/install/) instructions or use one of Rancher's [install scripts](https://github.com/rancher/install-docker) to install Docker. +You can either follow the [Docker installation](https://docs.docker.com/install/) instructions or use one of Rancher's [install scripts](https://github.com/rancher/install-docker) to install Docker. For RHEL, please see [How to install Docker on Red Hat Enterprise Linux 7](https://access.redhat.com/solutions/3727511). Docker Version | Install Script | ----------|------------------ -17.03.2 | curl https://releases.rancher.com/install-docker/17.03.sh | sh | -1.13.1 | curl https://releases.rancher.com/install-docker/1.13.sh | sh | -1.12.6 | curl https://releases.rancher.com/install-docker/1.12.sh | sh | +18.09.2 | curl https://releases.rancher.com/install-docker/18.09.2.sh | sh | +18.06.2 | curl https://releases.rancher.com/install-docker/18.06.2.sh | sh | +17.03.2 | curl https://releases.rancher.com/install-docker/17.03.2.sh | sh | -Confirm that a Kubernetes supported version of Docker is installed on your machine, by running `docker version`. +Confirm that a Kubernetes supported version of Docker is installed on your machine, by running `docker version --format '{{.Server.Version}}'`. ``` -$ docker version -Client: - Version: 17.03.2-ce - API version: 1.27 - Go version: go1.7.5 - Git commit: f5ec1e2 - Built: Tue Jun 27 03:35:14 2017 - OS/Arch: linux/amd64 - -Server: - Version: 17.03.2-ce - API version: 1.27 (minimum version 1.12) - Go version: go1.7.5 - Git commit: f5ec1e2 - Built: Tue Jun 27 03:35:14 2017 - OS/Arch: linux/amd64 - Experimental: false +docker version --format '{{.Server.Version}}' +17.03.2-ce ``` - OpenSSH 7.0+ - In order to SSH into each node, OpenSSH must be installed on each node.