From f49eb29497620de597f4690a29957f44341f3673 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Dec 2013 14:03:17 -0600 Subject: [PATCH 1/4] use mattdm/fedora in fedora doc and other cosmetic changes Signed-off-by: Lokesh Mandvekar --- docs/sources/installation/fedora.rst | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/sources/installation/fedora.rst b/docs/sources/installation/fedora.rst index 88b1037bfb..df3617c196 100644 --- a/docs/sources/installation/fedora.rst +++ b/docs/sources/installation/fedora.rst @@ -1,6 +1,6 @@ :title: Requirements and Installation on Fedora :description: Please note this project is currently under heavy development. It should not be used in production. -:keywords: Docker, Docker documentation, requirements, virtualbox, vagrant, git, ssh, putty, cygwin, linux +:keywords: Docker, Docker documentation, fedora, requirements, virtualbox, vagrant, git, ssh, putty, cygwin, linux .. _fedora: @@ -9,8 +9,6 @@ Fedora .. include:: install_header.inc -.. include:: install_unofficial.inc - Docker is available in **Fedora 19 and later**. Please note that due to the current Docker limitations Docker is able to run only on the **64 bit** architecture. @@ -24,19 +22,19 @@ Firstly, let's make sure our Fedora host is up-to-date. sudo yum -y upgrade -Next let's install the ``docker-io`` package which will install Docker on our host. +Next, let's install the ``docker-io`` package which will install Docker on our host. .. code-block:: bash sudo yum -y install docker-io -Now it's installed lets start the Docker daemon. +Now that it's installed, let's start the Docker daemon. .. code-block:: bash sudo systemctl start docker -If we want Docker to start at boot we should also: +If we want Docker to start at boot, we should also: .. code-block:: bash @@ -46,7 +44,7 @@ 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 61fbf3d8e27541882ff7c446a7f0edfb4ed03d82 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Dec 2013 14:21:03 -0600 Subject: [PATCH 2/4] yum upgrade on fedora not required before install Signed-off-by: Lokesh Mandvekar --- docs/sources/installation/fedora.rst | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/sources/installation/fedora.rst b/docs/sources/installation/fedora.rst index df3617c196..cbaa039fed 100644 --- a/docs/sources/installation/fedora.rst +++ b/docs/sources/installation/fedora.rst @@ -16,13 +16,7 @@ architecture. Installation ------------ -Firstly, let's make sure our Fedora host is up-to-date. - -.. code-block:: bash - - sudo yum -y upgrade - -Next, let's install the ``docker-io`` package which will install Docker on our host. +Install the ``docker-io`` package which will install Docker on our host. .. code-block:: bash From 5d022f04453d3bac2e17b8622f013420778e8d5b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Dec 2013 16:08:08 -0600 Subject: [PATCH 3/4] add unofficial header back, yum update docker Signed-off-by: Lokesh Mandvekar --- docs/sources/installation/fedora.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/sources/installation/fedora.rst b/docs/sources/installation/fedora.rst index cbaa039fed..67abda7184 100644 --- a/docs/sources/installation/fedora.rst +++ b/docs/sources/installation/fedora.rst @@ -9,6 +9,8 @@ Fedora .. include:: install_header.inc +.. include:: install_unofficial.inc + Docker is available in **Fedora 19 and later**. Please note that due to the current Docker limitations Docker is able to run only on the **64 bit** architecture. @@ -22,6 +24,9 @@ Install the ``docker-io`` package which will install Docker on our host. sudo yum -y install docker-io + # to keep docker-io up to date + sudo yum -y update docker-io + Now that it's installed, let's start the Docker daemon. .. code-block:: bash From 7ab4f37d6084c98e1f725be4cc88ea76bf952eb7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Dec 2013 16:11:33 -0600 Subject: [PATCH 4/4] separate block for yum update docker Signed-off-by: Lokesh Mandvekar --- docs/sources/installation/fedora.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/sources/installation/fedora.rst b/docs/sources/installation/fedora.rst index 67abda7184..9525371f03 100644 --- a/docs/sources/installation/fedora.rst +++ b/docs/sources/installation/fedora.rst @@ -24,7 +24,10 @@ Install the ``docker-io`` package which will install Docker on our host. sudo yum -y install docker-io - # to keep docker-io up to date +To update the ``docker-io`` package + +.. code-block:: bash + sudo yum -y update docker-io Now that it's installed, let's start the Docker daemon.