summaryrefslogtreecommitdiff
path: root/docs/sources/installation/fedora.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/sources/installation/fedora.md')
-rw-r--r--docs/sources/installation/fedora.md38
1 files changed, 38 insertions, 0 deletions
diff --git a/docs/sources/installation/fedora.md b/docs/sources/installation/fedora.md
index bcd54e6bd6..a230aa6cf5 100644
--- a/docs/sources/installation/fedora.md
+++ b/docs/sources/installation/fedora.md
@@ -48,6 +48,44 @@ Now let's verify that Docker is working.
$ sudo docker run -i -t fedora /bin/bash
+## 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.
+
+## HTTP Proxy
+
+If you are behind a HTTP proxy server, for example in corporate settings,
+you will need to add this configuration in the Docker *systemd service file*.
+
+Edit file `/lib/systemd/system/docker.service`. Add the following to
+section `[Service]` :
+
+ Environment="HTTP_PROXY=http://proxy.example.com:80/"
+
+If you have internal Docker registries that you need to contact without
+proxying you can specify them via the `NO_PROXY` environment variable:
+
+ Environment="HTTP_PROXY=http://proxy.example.com:80/" "NO_PROXY=localhost,127.0.0.0/8,docker-registry.somecorporation.com"
+
+Flush changes:
+
+ $ systemctl daemon-reload
+
+Restart Docker:
+
+ $ systemctl start docker
+
## What next?
Continue with the [User Guide](/userguide/).