docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update instructions for systemd drop-ins 

When creating a `/etc/systemd/system/docker.service`
unit file, that file _replaces_ the default
(`/lib/systemd/system/docker.service`) unit file.

While this may be intended by some, this section
describes how to use "partial" unit files ("drop-ins")
to override only certain properties of the default
unit file.

This patch removes the mention of
`/etc/systemd/system/docker.service` to prevent
users from inadvertently replacing the default
unit file.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2017-01-12 14:19:40 +01:00
parent 9157ec86aa
commit fdef92c118
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/admin/systemd.md
View File

@ -36,9 +36,7 @@ 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`.
`/etc/systemd/system/docker.service.d` directory.
However, if you had previously used a package which had an `EnvironmentFile`
(often pointing to `/etc/sysconfig/docker`) then for backwards compatibility,
@ -160,7 +158,7 @@ you will need to add this configuration in the Docker systemd service file.
1. Create a systemd drop-in directory for the docker service:
```bash
$ mkdir /etc/systemd/system/docker.service.d
$ mkdir -p /etc/systemd/system/docker.service.d
```
2. Create a file called `/etc/systemd/system/docker.service.d/http-proxy.conf`