1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The option --dns, --dns-search, --dns-opt and --net=host should not be mutually exclusive.

Browse Source 
This fix tries to address the issue raised in #21976 and allows
the options of `--dns`, `--dns-search`, `--dns-opt` and `--net=host`
to work at the same time.

The documentation has been updated and additional tests have been
added to cover this change.

This fix fixes #21976.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2016-04-28 22:46:57 -07:00 committed by Tibor Vass
parent 909fa15eb2
commit f17fb53f53
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/reference/run.md
View File

@ -382,11 +382,14 @@ name, they must be linked.
With the network set to `host` a container will share the host's With the network set to `host` a container will share the host's
network stack and all interfaces from the host will be available to the network stack and all interfaces from the host will be available to the
container. The container's hostname will match the hostname on the host container. The container's hostname will match the hostname on the host
system. Note that `--add-host` `--dns` `--dns-search` system. Note that `--add-host` and `--mac-address` are invalid in `host` netmode. Even in `host`
`--dns-opt` and `--mac-address` are invalid in `host` netmode. Even in `host`
network mode a container has its own UTS namespace by default. As such network mode a container has its own UTS namespace by default. As such
`--hostname` is allowed in `host` network mode and will only change the `--hostname` is allowed in `host` network mode and will only change the
hostname inside the container. hostname inside the container.
Note also that `--dns`, `--dns-search` and `--dns-opt` are
valid in `host` mode and `/etc/resolv.conf` will be updated accordingly. However, the
update in `/etc/resolv.conf` only happens inside the container. No change will be
made for `/etc/resolv.conf` in host.
Compared to the default `bridge` mode, the `host` mode gives *significantly* Compared to the default `bridge` mode, the `host` mode gives *significantly*
better networking performance since it uses the host's native networking stack better networking performance since it uses the host's native networking stack