beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #31291 from albers/docs-daemon-hosts

Browse source 
Clarify why `hosts` in `daemon.json` does not work
(cherry picked from commit 27c9a6e9c2)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Brian Goff 2017-02-23 10:47:26 -05:00 committed by Sebastiaan van Stijn
parent 05b81bc152
commit ef658fa65e
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/reference/commandline/dockerd.md
View file

@ -1205,6 +1205,13 @@ This is a full example of the allowed configuration options on Linux:
}
```
> **Note:** You cannot set options in `daemon.json` that have already been set on
> daemon startup as a flag.
> On systems that use `systemd` to start the Docker daemon, `-H` is already set, so
> you cannot use the `hosts` key in `daemon.json` to add listening addresses.
> See https://docs.docker.com/engine/admin/systemd/#custom-docker-daemon-options for how
> to accomplish this task with a systemd drop-in file.
##### On Windows
The default location of the configuration file on Windows is