From 30b4a0f76a63f24f96ba588216990f0ae7cd60a2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 17 Dec 2013 10:56:31 -0600 Subject: [PATCH] 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