From 340bd135ddf9a053dc6106a874e70e021a9e6acb Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Fri, 17 Jul 2015 14:04:19 -0700 Subject: [PATCH] Update RHEL/Centos/Fedora installation docs Remove mentions of older systems. Signed-off-by: Arnaud Porterie --- docs/installation/centos.md | 39 +++++++++++-------------------------- docs/installation/fedora.md | 2 +- docs/installation/rhel.md | 35 ++++++++------------------------- 3 files changed, 20 insertions(+), 56 deletions(-) diff --git a/docs/installation/centos.md b/docs/installation/centos.md index 6dac2bbd8e..b9a92784ac 100644 --- a/docs/installation/centos.md +++ b/docs/installation/centos.md @@ -13,9 +13,8 @@ parent = "smn_linux" Docker is supported on the following versions of CentOS: * CentOS 7.X -* CentOS 6.5 or higher -Installation on other binary compatible EL6/EL7 distributions such as Scientific +Installation on other binary compatible EL7 distributions such as Scientific Linux might succeed, but Docker does not test or support Docker on these distributions. @@ -27,20 +26,18 @@ CentOS documentation. ## Prerequisites Docker requires a 64-bit installation regardless of your CentOS version. Also, -your kernel must be 3.10 at minimum. CentOS 7 runs the 3.10 kernel, 6.5 does -not. We make an exception for CentOS 6.5. To run Docker on -[CentOS-6.5](https://www.centos.org) or later, you need kernel 2.6.32-431 or -higher. +your kernel must be 3.10 at minimum, which CentOS 7 runs. To check your current kernel version, open a terminal and use `uname -r` to display your kernel version: $ uname -r - 2.6.32-431.el6.x86_64 + 3.10.0-229.el7.x86_64 Finally, is it recommended that you fully update your system. Please keep in -mind that CentOS 6 should be fully patched to fix any potential kernel bugs. Any -reported kernel bugs may have already been fixed on the latest kernel packages +mind that your system should be fully patched to fix any potential kernel bugs. +Any reported kernel bugs may have already been fixed on the latest kernel +packages. ## Install @@ -52,19 +49,6 @@ only the package you install differs. There are two packages to choose from: Version Package name - - 6.5 and higher - -

- - https://get.docker.com/rpm/1.7.1/centos-6/RPMS/x86_64/docker-engine-1.7.1-1.el6.x86_64.rpm -

- - https://get.docker.com/rpm/1.7.1/centos-6/SRPMS/docker-engine-1.7.1-1.el6.src.rpm -

-

- - 7.X @@ -81,8 +65,7 @@ only the package you install differs. There are two packages to choose from: -This procedure depicts an installation on version 6.5. If you are installing on -7.X, substitute that package for your installation. +Installation procedure: 1. Log into your machine as a user with `sudo` or `root` privileges. @@ -92,11 +75,11 @@ This procedure depicts an installation on version 6.5. If you are installing on 3. Download the Docker RPM to the current directory. - $ curl -O -sSL https://get.docker.com/rpm/1.7.1/centos-6/RPMS/x86_64/docker-engine-1.7.1-1.el6.x86_64.rpm + $ curl -O -sSL https://get.docker.com/rpm/1.7.1/centos-7/RPMS/x86_64/docker-engine-1.7.1-1.el7.x86_64.rpm 4. Use `yum` to install the package. - $ sudo yum localinstall --nogpgcheck docker-engine-1.7.1-1.el6.x86_64.rpm + $ sudo yum localinstall --nogpgcheck docker-engine-1.7.1-1.el7.x86_64.rpm 5. Start the Docker daemon. @@ -179,8 +162,8 @@ You can uninstall the Docker software with `yum`. $ yum list installed | grep docker yum list installed | grep docker - docker-engine.x86_64 1.7.1-1.el6 - @/docker-engine-1.7.1-1.el6.x86_64.rpm + docker-engine.x86_64 1.7.1-1.el7 + @/docker-engine-1.7.1-1.el7.x86_64.rpm 2. Remove the package. diff --git a/docs/installation/fedora.md b/docs/installation/fedora.md index cc157dbaaa..026a706996 100644 --- a/docs/installation/fedora.md +++ b/docs/installation/fedora.md @@ -218,7 +218,7 @@ You can uninstall the Docker software with `yum`. $ yum list installed | grep docker yum list installed | grep docker docker-engine.x86_64 1.7.1-0.1.fc20 - @/docker-engine-1.7.1-0.1.fc20.el6.x86_64 + @/docker-engine-1.7.1-0.1.fc20.el7.x86_64 2. Remove the package. diff --git a/docs/installation/rhel.md b/docs/installation/rhel.md index d589e6b4a8..2695246cae 100644 --- a/docs/installation/rhel.md +++ b/docs/installation/rhel.md @@ -12,8 +12,7 @@ parent = "smn_linux" Docker is supported on the following versions of RHEL: -- Red Hat Enterprise Linux 7 -- Red Hat Enterprise Linux 6.6 or later +- Red Hat Enterprise Linux 7 This page instructs you to install using Docker-managed release packages and installation mechanisms. Using these packages ensures you get the latest release @@ -23,10 +22,7 @@ Red Hat release documentation for information on Red Hat's Docker support. ## Prerequisites Docker requires a 64-bit installation regardless of your Red Hat version. Docker -requires that your kernel must be 3.10 at minimum. Red Hat 7 runs the 3.10 -kernel, 6.6 does not. We make an exception for Red Hat 6.6. To run Docker on -[Red Hat-6.6](http://www.centos.org) or later, you need kernel 2.6.32-431 or -higher. +requires that your kernel must be 3.10 at minimum, which Red Hat 7 runs. To check your current kernel version, open a terminal and use `uname -r` to display your kernel version: @@ -37,8 +33,7 @@ display your kernel version: Finally, is it recommended that you fully update your system. Please keep in mind that your system should be fully patched to fix any potential kernel bugs. Any reported kernel bugs may have already been fixed on the latest kernel -packages - +packages. ## Install @@ -50,19 +45,6 @@ only the package you install differs. There are two packages to choose from: Version Package name - - 6.6 and higher - -

- - https://get.docker.com/rpm/1.7.1/centos-6/RPMS/x86_64/docker-engine-1.7.1-1.el6.x86_64.rpm -

- - https://get.docker.com/rpm/1.7.1/centos-6/SRPMS/docker-engine-1.7.1-1.el6.src.rpm -

-

- - 7.X @@ -78,18 +60,17 @@ only the package you install differs. There are two packages to choose from: -This procedure depicts an installation on version 6.6. If you are installing on -7.X, substitute that package for your installation. +Installation procedure: 1. Log into your machine as a user with `sudo` or `root` privileges. 2. Download the Docker RPM to the current directory. - $ curl -O -sSL https://get.docker.com/rpm/1.7.1/centos-6/RPMS/x86_64/docker-engine-1.7.1-1.el6.x86_64.rpm + $ curl -O -sSL https://get.docker.com/rpm/1.7.1/centos-7/RPMS/x86_64/docker-engine-1.7.1-1.el7.x86_64.rpm 3. Use `yum` to install the package. - $ sudo yum localinstall --nogpgcheck docker-engine-1.7.1-1.el6.x86_64.rpm + $ sudo yum localinstall --nogpgcheck docker-engine-1.7.1-1.el7.x86_64.rpm 5. Start the Docker daemon. @@ -172,8 +153,8 @@ You can uninstall the Docker software with `yum`. $ yum list installed | grep docker yum list installed | grep docker - docker-engine.x86_64 1.7.1-0.1.el6 - @/docker-engine-1.7.1-0.1.el6.x86_64 + docker-engine.x86_64 1.7.1-0.1.el7 + @/docker-engine-1.7.1-0.1.el7.x86_64 2. Remove the package.