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

Merge pull request #1103 from thaJeztah/fix-systemd-instructions 

Update instructions for systemd drop-ins
This commit is contained in:
Misty Stanley-Jones 2017-01-18 13:28:56 -08:00 committed by GitHub
parent 6b3a6fef9e fdef92c118
commit 611206fe47
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`