From 7d95145b76decc511bc78d887ec3843bd182e58a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 17 Dec 2013 10:33:52 -0600 Subject: [PATCH 1/3] update fedora doc: docker and docker-io conflict Signed-off-by: Lokesh Mandvekar --- docs/sources/installation/fedora.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docs/sources/installation/fedora.rst b/docs/sources/installation/fedora.rst index 9525371f03..75c3503f28 100644 --- a/docs/sources/installation/fedora.rst +++ b/docs/sources/installation/fedora.rst @@ -18,12 +18,32 @@ architecture. Installation ------------ +The ``docker-io`` package provides Docker on fedora. + +If you already have the (unrelated) ``docker`` package installed, it will +conflict with ``docker-io``. There's a `bug report`_ filed for it. +To proceed with ``docker-io`` installation on fedora 19, please remove +``docker`` first. + +.. code-block:: bash + + sudo yum -y remove docker + +For fedora 20 and above, the ``wmdocker`` package will provide the same +functionality as ``docker`` and will also not conflict with ``docker-io`` + +.. code-block:: bash + + sudo yum -y install wmdocker + sudo yum -y remove docker + Install the ``docker-io`` package which will install Docker on our host. .. code-block:: bash sudo yum -y install docker-io + To update the ``docker-io`` package .. code-block:: bash @@ -50,3 +70,4 @@ Now let's verify that Docker is working. **Done!**, now continue with the :ref:`hello_world` example. +.. _bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1043676 From 30b4a0f76a63f24f96ba588216990f0ae7cd60a2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 17 Dec 2013 10:56:31 -0600 Subject: [PATCH 2/3] docker and docker-io conflict update for epel Signed-off-by: Lokesh Mandvekar --- docs/sources/installation/fedora.rst | 2 ++ docs/sources/installation/rhel.rst | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/docs/sources/installation/fedora.rst b/docs/sources/installation/fedora.rst index 75c3503f28..a73a8e8530 100644 --- a/docs/sources/installation/fedora.rst +++ b/docs/sources/installation/fedora.rst @@ -20,6 +20,7 @@ Installation The ``docker-io`` package provides Docker on fedora. + If you already have the (unrelated) ``docker`` package installed, it will conflict with ``docker-io``. There's a `bug report`_ filed for it. To proceed with ``docker-io`` installation on fedora 19, please remove @@ -71,3 +72,4 @@ Now let's verify that Docker is working. **Done!**, now continue with the :ref:`hello_world` example. .. _bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1043676 + diff --git a/docs/sources/installation/rhel.rst b/docs/sources/installation/rhel.rst index 993d329df7..b928b333f4 100644 --- a/docs/sources/installation/rhel.rst +++ b/docs/sources/installation/rhel.rst @@ -28,6 +28,15 @@ Installation Firstly, you need to install the EPEL repository. Please follow the `EPEL installation instructions`_. +The ``docker-io`` package provides Docker on EPEL. + + +If you already have the (unrelated) ``docker`` package installed, it will +conflict with ``docker-io``. There's a `bug report`_ filed for it. +To proceed with ``docker-io`` installation, please remove +``docker`` first. + + Next, let's install the ``docker-io`` package which will install Docker on our host. .. code-block:: bash @@ -68,4 +77,5 @@ If you have any issues - please report them directly in the `Red Hat Bugzilla fo .. _Extra Packages for Enterprise Linux (EPEL): https://fedoraproject.org/wiki/EPEL .. _EPEL installation instructions: https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F .. _Red Hat Bugzilla for docker-io component : https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=docker-io +.. _bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1043676 From 25be0b1e987934ca39085894730b54f4bbcd8ad2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 17 Dec 2013 11:32:40 -0600 Subject: [PATCH 3/3] Fedora first letter capitalize and misc. rewording Signed-off-by: Lokesh Mandvekar --- docs/sources/installation/fedora.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/sources/installation/fedora.rst b/docs/sources/installation/fedora.rst index a73a8e8530..de296b4df2 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, fedora, requirements, virtualbox, vagrant, git, ssh, putty, cygwin, linux +:keywords: Docker, Docker documentation, Fedora, requirements, virtualbox, vagrant, git, ssh, putty, cygwin, linux .. _fedora: @@ -18,20 +18,20 @@ architecture. Installation ------------ -The ``docker-io`` package provides Docker on fedora. +The ``docker-io`` package provides Docker on Fedora. -If you already have the (unrelated) ``docker`` package installed, it will +If you have the (unrelated) ``docker`` package installed already, it will conflict with ``docker-io``. There's a `bug report`_ filed for it. -To proceed with ``docker-io`` installation on fedora 19, please remove +To proceed with ``docker-io`` installation on Fedora 19, please remove ``docker`` first. .. code-block:: bash sudo yum -y remove docker -For fedora 20 and above, the ``wmdocker`` package will provide the same -functionality as ``docker`` and will also not conflict with ``docker-io`` +For Fedora 20 and later, the ``wmdocker`` package will provide the same +functionality as ``docker`` and will also not conflict with ``docker-io``. .. code-block:: bash @@ -45,7 +45,7 @@ Install the ``docker-io`` package which will install Docker on our host. sudo yum -y install docker-io -To update the ``docker-io`` package +To update the ``docker-io`` package: .. code-block:: bash