瀏覽代碼

update fedora docs to reflect latest rpm changes

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
Lokesh Mandvekar 10 年之前
父節點
當前提交
66839cf3a6
共有 1 個文件被更改,包括 20 次插入30 次删除
  1. 20 30
      docs/sources/installation/fedora.md

+ 20 - 30
docs/sources/installation/fedora.md

@@ -4,37 +4,30 @@ page_keywords: Docker, Docker documentation, Fedora, requirements, virtualbox, v
 
 # Fedora
 
-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.
+Docker is supported only on Fedora 20 and later,
+on the **64 bit** architecture.
 
 ## Installation
 
-The `docker-io` package provides Docker on Fedora.
+For `Fedora 20`, the `docker-io` package provides Docker.
 
 If you have the (unrelated) `docker` package installed already, it will
-conflict with `docker-io`. There's a [bug
-report](https://bugzilla.redhat.com/show_bug.cgi?id=1043676) filed for
-it. To proceed with `docker-io` installation on Fedora 19, please remove
-`docker` first.
+conflict with `docker-io`. To proceed with `docker-io` installation on
+Fedora 20, please remove `docker` first.
 
     $ sudo yum -y remove docker
+    $ sudo yum -y install docker-io
 
-For Fedora 21 and later, the `wmdocker` package will
-provide the same functionality as `docker` and will
-also not conflict with `docker-io`.
-
-    $ sudo yum -y install wmdocker
-    $ sudo yum -y remove docker
+For `Fedora 21 and later`, there are no package conflicts as the system
+tray application and its executable have been renamed `wmdocker`.
 
-Install the `docker-io` package which will install
-Docker on our host.
+Install the `docker` package which will install Docker on our host.
 
-    $ sudo yum -y install docker-io
+    $ sudo yum -y install docker
 
-To update the `docker-io` package:
+To update the `docker` package:
 
-    $ sudo yum -y update docker-io
+    $ sudo yum -y update docker
 
 Now that it's installed, let's start the Docker daemon.
 
@@ -54,18 +47,15 @@ Now let's verify that Docker is working.
 
 ## Granting rights to users to use Docker
 
-Fedora 19 and 20 shipped with Docker 0.11. The package has already been updated
-to 1.0 in Fedora 20. If you are still using the 0.11 version you will need to
-grant rights to users of Docker.
-
 The `docker` command line tool contacts the `docker` daemon process via a
-socket file `/var/run/docker.sock` owned by group `docker`. One must be 
-member of that group in order to contact the `docker -d` process.
-
-    $ usermod -a -G docker login_name
-
-Adding users to the `docker` group is *not* necessary for Docker versions 1.0
-and above.
+socket file `/var/run/docker.sock` owned by `root:root`. Though it's
+[recommended](https://lists.projectatomic.io/projectatomic-archives/atomic-devel/2015-January/msg00034.html)
+to use `sudo` for docker commands, if users wish to avoid it, an administrator can
+create a `docker` group, have it own `/var/run/docker.sock`, and add users to this group.
+
+    $ sudo groupadd docker
+    $ sudo chown root:docker /var/run/docker.sock
+    $ sudo usermod -a -G docker $USERNAME
 
 ## Custom daemon options