Skip to content

Commit 4e407e6

Browse files
lsm5Arnaud Porterie
authored andcommitted
update fedora docs to reflect latest rpm changes
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
1 parent 23f1c2e commit 4e407e6

File tree

1 file changed

+20
-30
lines changed

1 file changed

+20
-30
lines changed

docs/sources/installation/fedora.md

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,30 @@ page_keywords: Docker, Docker documentation, Fedora, requirements, virtualbox, v
44

55
# Fedora
66

7-
Docker is available in **Fedora 19 and later**. Please note that due to
8-
the current Docker limitations Docker is able to run only on the **64
9-
bit** architecture.
7+
Docker is supported only on Fedora 20 and later,
8+
on the **64 bit** architecture.
109

1110
## Installation
1211

13-
The `docker-io` package provides Docker on Fedora.
12+
For `Fedora 20`, the `docker-io` package provides Docker.
1413

1514
If you have the (unrelated) `docker` package installed already, it will
16-
conflict with `docker-io`. There's a [bug
17-
report](https://bugzilla.redhat.com/show_bug.cgi?id=1043676) filed for
18-
it. To proceed with `docker-io` installation on Fedora 19, please remove
19-
`docker` first.
15+
conflict with `docker-io`. To proceed with `docker-io` installation on
16+
Fedora 20, please remove `docker` first.
2017

2118
$ sudo yum -y remove docker
19+
$ sudo yum -y install docker-io
2220

23-
For Fedora 21 and later, the `wmdocker` package will
24-
provide the same functionality as `docker` and will
25-
also not conflict with `docker-io`.
26-
27-
$ sudo yum -y install wmdocker
28-
$ sudo yum -y remove docker
21+
For `Fedora 21 and later`, there are no package conflicts as the system
22+
tray application and its executable have been renamed `wmdocker`.
2923

30-
Install the `docker-io` package which will install
31-
Docker on our host.
24+
Install the `docker` package which will install Docker on our host.
3225

33-
$ sudo yum -y install docker-io
26+
$ sudo yum -y install docker
3427

35-
To update the `docker-io` package:
28+
To update the `docker` package:
3629

37-
$ sudo yum -y update docker-io
30+
$ sudo yum -y update docker
3831

3932
Now that it's installed, let's start the Docker daemon.
4033

@@ -54,18 +47,15 @@ Now let's verify that Docker is working.
5447
5548
## Granting rights to users to use Docker
5649

57-
Fedora 19 and 20 shipped with Docker 0.11. The package has already been updated
58-
to 1.0 in Fedora 20. If you are still using the 0.11 version you will need to
59-
grant rights to users of Docker.
60-
6150
The `docker` command line tool contacts the `docker` daemon process via a
62-
socket file `/var/run/docker.sock` owned by group `docker`. One must be
63-
member of that group in order to contact the `docker -d` process.
64-
65-
$ usermod -a -G docker login_name
66-
67-
Adding users to the `docker` group is *not* necessary for Docker versions 1.0
68-
and above.
51+
socket file `/var/run/docker.sock` owned by `root:root`. Though it's
52+
[recommended](https://lists.projectatomic.io/projectatomic-archives/atomic-devel/2015-January/msg00034.html)
53+
to use `sudo` for docker commands, if users wish to avoid it, an administrator can
54+
create a `docker` group, have it own `/var/run/docker.sock`, and add users to this group.
55+
56+
$ sudo groupadd docker
57+
$ sudo chown root:docker /var/run/docker.sock
58+
$ sudo usermod -a -G docker $USERNAME
6959

7060
## Custom daemon options
7161

0 commit comments

Comments
 (0)