From c55d5472f2670eb0904eb4406e8a104cba7d1031 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 11 Dec 2013 14:34:51 -0600 Subject: [PATCH 1/6] rhel docs update Signed-off-by: Lokesh Mandvekar Upstream-commit: eec48f93a36873b8255c1c533b0d2bfbd742f9fa Component: engine --- .../engine/docs/sources/installation/rhel.rst | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/components/engine/docs/sources/installation/rhel.rst b/components/engine/docs/sources/installation/rhel.rst index 443d5a4ffc..cfbddf740f 100644 --- a/components/engine/docs/sources/installation/rhel.rst +++ b/components/engine/docs/sources/installation/rhel.rst @@ -1,6 +1,6 @@ -:title: Requirements and Installation on Red Hat Enterprise Linux / CentOS +:title: Requirements and Installation on Red Hat Enterprise Linux :description: Please note this project is currently under heavy development. It should not be used in production. -:keywords: Docker, Docker documentation, requirements, linux, rhel, centos +:keywords: Docker, Docker documentation, requirements, linux, rhel .. _rhel: @@ -11,7 +11,7 @@ Red Hat Enterprise Linux / CentOS .. include:: install_unofficial.inc -Docker is available for **RHEL/CentOS 6**. +Docker is available for **RHEL**. Please note that this package is part of a `Extra Packages for Enterprise Linux (EPEL)`_, a community effort to create and maintain additional packages for RHEL distribution. @@ -20,21 +20,15 @@ Please note that due to the current Docker limitations Docker is able to run onl Installation ------------ -1. Firstly, let's make sure our RHEL host is up-to-date. +1. First, you need to install the EPEL repository. Please follow the `EPEL installation instructions`_. -.. code-block:: bash - - sudo yum -y upgrade - -2. Next you need to install the EPEL repository. Please follow the `EPEL installation instructions`_. - -3. Next let's install the ``docker-io`` package which will install Docker on our host. +2. Next let's install the ``docker-io`` package which will install Docker on our host. .. code-block:: bash sudo yum -y install docker-io -4. Now it's installed lets start the Docker daemon. +3. Now it's installed lets start the Docker daemon. .. code-block:: bash @@ -46,11 +40,11 @@ If we want Docker to start at boot we should also: sudo chkconfig docker on -5. Now let's verify that Docker is working. +4. Now let's verify that Docker is working. .. code-block:: bash - sudo docker run -i -t ubuntu /bin/bash + sudo docker run -i -t mattdm/fedora /bin/bash **Done!**, now continue with the :ref:`hello_world` example. From 17c7de84912e59f248e3fff4bd2fdf1b21ebe61e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 11 Dec 2013 14:36:12 -0600 Subject: [PATCH 2/6] rhel page only for rhel Signed-off-by: Lokesh Mandvekar Upstream-commit: 31961ccd94bc2d0941d3062591206a58b3b451a1 Component: engine --- components/engine/docs/sources/installation/rhel.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/docs/sources/installation/rhel.rst b/components/engine/docs/sources/installation/rhel.rst index cfbddf740f..afc3548702 100644 --- a/components/engine/docs/sources/installation/rhel.rst +++ b/components/engine/docs/sources/installation/rhel.rst @@ -4,8 +4,8 @@ .. _rhel: -Red Hat Enterprise Linux / CentOS -================================= +Red Hat Enterprise Linux +======================== .. include:: install_header.inc From f68960fa0e46eb435a844a0e4cc54d2b93a9d37c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 11 Dec 2013 15:59:35 -0600 Subject: [PATCH 3/6] rhel description update Signed-off-by: Lokesh Mandvekar Upstream-commit: 42c38bf34dff7a5af4c75646b7252d3ecbdd334a Component: engine --- components/engine/docs/sources/installation/rhel.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/engine/docs/sources/installation/rhel.rst b/components/engine/docs/sources/installation/rhel.rst index afc3548702..a4484afaef 100644 --- a/components/engine/docs/sources/installation/rhel.rst +++ b/components/engine/docs/sources/installation/rhel.rst @@ -11,7 +11,9 @@ Red Hat Enterprise Linux .. include:: install_unofficial.inc -Docker is available for **RHEL**. +Docker is available for **RHEL** on EPEL. These instructions should work for +both RHEL and CentOS. They will likely work with +other binary compatible EL6 version as well, but they haven't been tested. Please note that this package is part of a `Extra Packages for Enterprise Linux (EPEL)`_, a community effort to create and maintain additional packages for RHEL distribution. From 18d434e8aae60ec0ec412d8bd792e94df9a0a50b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 11 Dec 2013 16:00:46 -0600 Subject: [PATCH 4/6] rhel page keywords update Signed-off-by: Lokesh Mandvekar Upstream-commit: db3019d50b7a38dd52d8ad959017c63b04f11462 Component: engine --- components/engine/docs/sources/installation/rhel.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/docs/sources/installation/rhel.rst b/components/engine/docs/sources/installation/rhel.rst index a4484afaef..3204af133a 100644 --- a/components/engine/docs/sources/installation/rhel.rst +++ b/components/engine/docs/sources/installation/rhel.rst @@ -1,6 +1,6 @@ :title: Requirements and Installation on Red Hat Enterprise Linux :description: Please note this project is currently under heavy development. It should not be used in production. -:keywords: Docker, Docker documentation, requirements, linux, rhel +:keywords: Docker, Docker documentation, requirements, linux, rhel, centos .. _rhel: From 51019ea44e1e3d413099da0b3d560ba0e0dc7edf Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 11 Dec 2013 16:20:54 -0600 Subject: [PATCH 5/6] some typo corrections Signed-off-by: Lokesh Mandvekar Upstream-commit: d534e1c3a1e00786d63e9dbeffceb6ab7f51c92b Component: engine --- .../engine/docs/sources/installation/rhel.rst | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/components/engine/docs/sources/installation/rhel.rst b/components/engine/docs/sources/installation/rhel.rst index 3204af133a..2385b614ce 100644 --- a/components/engine/docs/sources/installation/rhel.rst +++ b/components/engine/docs/sources/installation/rhel.rst @@ -12,25 +12,34 @@ Red Hat Enterprise Linux .. include:: install_unofficial.inc Docker is available for **RHEL** on EPEL. These instructions should work for -both RHEL and CentOS. They will likely work with -other binary compatible EL6 version as well, but they haven't been tested. +both RHEL and CentOS. They will likely work with other binary compatible EL6 +distributions as well, but the haven't been tested. -Please note that this package is part of a `Extra Packages for Enterprise Linux (EPEL)`_, a community effort to create and maintain additional packages for RHEL distribution. +Please note that this package is part of `Extra Packages for Enterprise +Linux (EPEL)`_, a community effort to create and maintain additional packages +for the RHEL distribution. -Please note that due to the current Docker limitations Docker is able to run only on the **64 bit** architecture. +Please note that due to the current Docker limitations, Docker is able to run +only on the **64 bit** architecture. Installation ------------ -1. First, you need to install the EPEL repository. Please follow the `EPEL installation instructions`_. +1. Firstly, you need to install the EPEL repository. Please follow the `EPEL installation instructions`_. -2. Next let's install the ``docker-io`` package which will install Docker on our host. +2. Next, let's install the ``docker-io`` package which will install Docker on our host. .. code-block:: bash sudo yum -y install docker-io -3. Now it's installed lets start the Docker daemon. +To keep docker up to date: + +.. code-block:: bash + + sudo yum -y update docker-io + +3. Now that it's installed, lets start the Docker daemon. .. code-block:: bash From 256dcd72558c09f4f5811c21bbdc39ca8a49d60f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 11 Dec 2013 16:36:14 -0600 Subject: [PATCH 6/6] more typo corrections Signed-off-by: Lokesh Mandvekar Upstream-commit: 44984602c7c7460454531c22ee4dfab2a34fa334 Component: engine --- components/engine/docs/sources/installation/rhel.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/docs/sources/installation/rhel.rst b/components/engine/docs/sources/installation/rhel.rst index 2385b614ce..f1169a0c79 100644 --- a/components/engine/docs/sources/installation/rhel.rst +++ b/components/engine/docs/sources/installation/rhel.rst @@ -12,14 +12,14 @@ Red Hat Enterprise Linux .. include:: install_unofficial.inc Docker is available for **RHEL** on EPEL. These instructions should work for -both RHEL and CentOS. They will likely work with other binary compatible EL6 -distributions as well, but the haven't been tested. +both RHEL and CentOS. They will likely work for other binary compatible EL6 +distributions as well, but they haven't been tested. Please note that this package is part of `Extra Packages for Enterprise Linux (EPEL)`_, a community effort to create and maintain additional packages for the RHEL distribution. -Please note that due to the current Docker limitations, Docker is able to run +Also note that due to the current Docker limitations, Docker is able to run only on the **64 bit** architecture. Installation