summaryrefslogtreecommitdiff
path: root/docs/podman-run.1.md
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-19 02:22:28 +0200
committerGitHub <noreply@github.com>2019-07-19 02:22:28 +0200
commitb59abdc1b1cf72d86d3fe6bb76ba646870c86ed6 (patch)
tree077b0c03cbc511267dd2d6401952178a70ec3296 /docs/podman-run.1.md
parentb98e015527d5b1981307d36c40a42ca1531b583c (diff)
parent3f721f8b17780931a75f9e072e4d32bf9a49e976 (diff)
downloadpodman-b59abdc1b1cf72d86d3fe6bb76ba646870c86ed6.tar.gz
podman-b59abdc1b1cf72d86d3fe6bb76ba646870c86ed6.tar.bz2
podman-b59abdc1b1cf72d86d3fe6bb76ba646870c86ed6.zip
Merge pull request #3579 from QiWang19/dns_net
fix --dns and --network conflict
Diffstat (limited to 'docs/podman-run.1.md')
-rw-r--r--docs/podman-run.1.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index 6315afea6..6d95d6045 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -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