瀏覽代碼

docker and docker-io conflict update for epel

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Lokesh Mandvekar 11 年之前
父節點
當前提交
30b4a0f76a
共有 2 個文件被更改,包括 12 次插入0 次删除
  1. 2 0
      docs/sources/installation/fedora.rst
  2. 10 0
      docs/sources/installation/rhel.rst

+ 2 - 0
docs/sources/installation/fedora.rst

@@ -20,6 +20,7 @@ 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 already have the (unrelated) ``docker`` package installed, it will
 conflict with ``docker-io``. There's a `bug report`_ filed for it.
 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
@@ -71,3 +72,4 @@ Now let's verify that Docker is working.
 **Done!**, now continue with the :ref:`hello_world` example.
 **Done!**, now continue with the :ref:`hello_world` example.
 
 
 .. _bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1043676
 .. _bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1043676
+

+ 10 - 0
docs/sources/installation/rhel.rst

@@ -28,6 +28,15 @@ Installation
 Firstly, you need to install the EPEL repository. Please follow the `EPEL installation instructions`_.
 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.
 Next, let's install the ``docker-io`` package which will install Docker on our host.
 
 
 .. code-block:: bash
 .. 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
 .. _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
 .. _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
 .. _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