opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-02 02:26:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3579 from QiWang19/dns_net

Browse Source 
fix --dns and --network conflict
This commit is contained in:
OpenShift Merge Robot
2019-07-19 02:22:28 +02:00
committed by GitHub
parent b98e015527 3f721f8b17
commit b59abdc1b1
4 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/podman-run.1.md
View File

@ -220,7 +220,7 @@ Limit write rate (IO per second) to a device (e.g. --device-write-iops=/dev/sda:
**--dns**=*dns*
Set custom DNS servers
Set custom DNS servers. Invalid if using **--dns** with **--network** that is set to 'none' or 'container:<name|id>'.
This option can be used to override the DNS
configuration passed to the container. Typically this is necessary when the
@ -232,11 +232,11 @@ The **/etc/resolv.conf** file in the image will be used without changes.
**--dns-option**=*option*
Set custom DNS options
Set custom DNS options. Invalid if using **--dns-option** with **--network** that is set to 'none' or 'container:<name|id>'.
**--dns-search**=*domain*
Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain)
Set custom DNS search domains. Invalid if using **--dns-search** and **--network** that is set to 'none' or 'container:<name|id>'. (Use --dns-search=. if you don't wish to set the search domain)
**--entrypoint**=*"command"* | *'["command", "arg1", ...]'*
@ -510,9 +510,9 @@ to the container with **--name** then it will generate a random
string name. The name is useful any place you need to identify a container.
This works for both background and foreground containers.
**--network**, **--net**=*mode*
**--network**, **--net**=*node*
Set the Network mode for the container:
Set the Network mode for the container. Invalid if using **--dns**, **--dns-option**, or **--dns-search** with **--network** that is set to 'none' or 'container:<name|id>'.
- `bridge`: create a network stack on the default bridge
- `none`: no networking
- `container:<name|id>`: reuse another container's network stack