diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-27 10:49:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 10:49:42 -0700 |
| commit | 340eeec1b654880f9d339c9ac2957bcaeaee6829 (patch) | |
| tree | 4256daeae13e2de6145d3b5c5be5f1929e955bbc /docs | |
| parent | 1ff03ee9f5e72fd62ba8e798035fa43f8f18b6dd (diff) | |
| parent | 0cd92eae65b31cdbaa19e3cccb0e3234196a6d17 (diff) | |
| download | podman-340eeec1b654880f9d339c9ac2957bcaeaee6829.tar.gz podman-340eeec1b654880f9d339c9ac2957bcaeaee6829.tar.bz2 podman-340eeec1b654880f9d339c9ac2957bcaeaee6829.zip | |
Merge pull request #2747 from mheon/dns_none
Add --dns=none
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/podman-create.1.md | 10 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 2e176db76..f61deebd2 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -204,6 +204,9 @@ configuration passed to the container. Typically this is necessary when the host DNS configuration is invalid for the container (e.g., 127.0.0.1). When this is the case the **--dns** flags is necessary for every run. +The special value **none** can be specified to disable creation of **/etc/resolv.conf** in the container by Podman. +The **/etc/resolv.conf** file in the image will be used without changes. + **--dns-option**=[] Set custom DNS options @@ -457,6 +460,13 @@ Set the Network mode for the container Not implemented +**--no-hosts**=*true*|*false* + +Do not create /etc/hosts for the container. +By default, Podman will manage /etc/hosts, adding the container's own IP address and any hosts from **--add-host**. +**--no-hosts** disables this, and the image's **/etc/host** will be preserved unmodified. +This option conflicts with **--add-host**. + **--oom-kill-disable**=*true*|*false* Whether to disable OOM Killer for the container or not. diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index b8b3d51f0..5a311980f 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -210,6 +210,9 @@ configuration passed to the container. Typically this is necessary when the host DNS configuration is invalid for the container (e.g., 127.0.0.1). When this is the case the **--dns** flags is necessary for every run. +The special value **none** can be specified to disable creation of **/etc/resolv.conf** in the container by Podman. +The **/etc/resolv.conf** file in the image will be used without changes. + **--dns-option**=[] Set custom DNS options @@ -441,6 +444,13 @@ Set the Network mode for the container: Not implemented +**--no-hosts**=*true*|*false* + +Do not create /etc/hosts for the container. +By default, Podman will manage /etc/hosts, adding the container's own IP address and any hosts from **--add-host**. +**--no-hosts** disables this, and the image's **/etc/host** will be preserved unmodified. +This option conflicts with **--add-host**. + **--oom-kill-disable**=*true*|*false* Whether to disable OOM Killer for the container or not. |