diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2016-05-06 15:52:42 -0400 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2016-05-11 14:41:01 +0200 |
| commit | b706ee90ca937d7cfc57ce61aa7aeae5c519e7f3 (patch) | |
| tree | d4c74859fa53e2da8573d40f355bc7573f2f4763 | |
| parent | 2f4b69229a0152c65a84a36dfbd4dcc453c53608 (diff) | |
| download | docker-b706ee90ca937d7cfc57ce61aa7aeae5c519e7f3.tar.gz | |
docs: note requirements for systemd drop-in filenames
the documentations says that you can drop "a file" into the
`docker.service.d` directory, but does not note that the file must end
with `.conf` in order to be recognized by systemd. This can lead to
some [confusion][] if readers are not previously familiar with
systemd.
[confusion]: https://botbot.me/freenode/docker/2016-05-06/?msg=65605541&page=11
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
(cherry picked from commit 987b03054af8bfa5147465d4fe5d5a554cd5fee3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| -rw-r--r-- | docs/admin/systemd.md | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/docs/admin/systemd.md b/docs/admin/systemd.md index ff1d54607f..ef44e8e9ee 100644 --- a/docs/admin/systemd.md +++ b/docs/admin/systemd.md @@ -33,15 +33,19 @@ If you want Docker to start at boot, you should also: There are a number of ways to configure the daemon flags and environment variables for your Docker daemon. -The recommended way is to use a systemd drop-in file. These are local files in -the `/etc/systemd/system/docker.service.d` directory. This could also be -`/etc/systemd/system/docker.service`, which also works for overriding the -defaults from `/lib/systemd/system/docker.service`. - -However, if you had previously used a package which had an `EnvironmentFile` -(often pointing to `/etc/sysconfig/docker`) then for backwards compatibility, -you drop a file in the `/etc/systemd/system/docker.service.d` -directory including the following: +The recommended way is to use a systemd drop-in file (as described in +the <a target="_blank" +href="https://www.freedesktop.org/software/systemd/man/systemd.unit.html">systemd.unit</a> +documentation). These are local files named `<something>.conf` in the +`/etc/systemd/system/docker.service.d` directory. This could also be +`/etc/systemd/system/docker.service`, which also works for overriding +the defaults from `/lib/systemd/system/docker.service`. + +However, if you had previously used a package which had an +`EnvironmentFile` (often pointing to `/etc/sysconfig/docker`) then for +backwards compatibility, you drop a file with a `.conf` extension into +the `/etc/systemd/system/docker.service.d` directory including the +following: [Service] EnvironmentFile=-/etc/sysconfig/docker |