Browse code

Merge pull request #14539 from nhocki/improve-docs-for-execstart

Adding information about ExecStart configuration for systemd

moxiegirl authored on 2015/08/02 01:23:59
Showing 1 changed files
... ...
@@ -51,7 +51,7 @@ property:
51 51
     EnvironmentFile=-/etc/sysconfig/docker
52 52
 
53 53
 You can customize the Docker daemon options using override files as explained in the
54
-[HTTP Proxy example](#http-proxy) below. The files located in `/usr/lib/systemd/system` 
54
+[HTTP Proxy example](#http-proxy) below. The files located in `/usr/lib/systemd/system`
55 55
 or `/lib/systemd/system` contain the default options and should not be edited.
56 56
 
57 57
 ### Runtime directory and storage driver
... ...
@@ -85,6 +85,17 @@ setting `OPTIONS`:
85 85
 You can also set other environment variables in this file, for example, the
86 86
 `HTTP_PROXY` environment variables described below.
87 87
 
88
+To modify the ExecStart configuration, specify an empty configuration followed
89
+by a new configuration as follows:
90
+
91
+    [Service]
92
+    ExecStart=
93
+    ExecStart=/usr/bin/docker -d -H fd:// --bip=172.17.42.1/16
94
+
95
+If you fail to specify an empty configuration, Docker reports an error such as:
96
+
97
+    docker.service has more than one ExecStart= setting, which is only allowed for Type=oneshot services. Refusing.
98
+
88 99
 ### HTTP proxy
89 100
 
90 101
 This example overrides the default `docker.service` file.
... ...
@@ -127,5 +138,3 @@ to integrate Docker with systemd. For this, simply install the two unit files
127 127
 (service and socket) from [the github
128 128
 repository](https://github.com/docker/docker/tree/master/contrib/init/systemd)
129 129
 to `/etc/systemd/system`.
130
-
131
-