diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-03-25 12:24:46 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-03-27 10:12:18 -0400 |
| commit | 323dc526ce8d8f236eca06b518dcf35f260d6379 (patch) | |
| tree | 9755849d7cc2f285489a14949af1e6c2bf72c45c | |
| parent | 236300d02832b1c131e5d70f3510e5169857b69b (diff) | |
| download | podman-323dc526ce8d8f236eca06b518dcf35f260d6379.tar.gz podman-323dc526ce8d8f236eca06b518dcf35f260d6379.tar.bz2 podman-323dc526ce8d8f236eca06b518dcf35f260d6379.zip | |
Add manpages and completions for dns=none and no-hosts
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| -rw-r--r-- | completions/bash/podman | 1 | ||||
| -rw-r--r-- | docs/podman-create.1.md | 10 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 10 |
3 files changed, 21 insertions, 0 deletions
diff --git a/completions/bash/podman b/completions/bash/podman index dfa673481..798d49ceb 100644 --- a/completions/bash/podman +++ b/completions/bash/podman @@ -1727,6 +1727,7 @@ _podman_container_run() { --memory-reservation --name --network + --no-hosts --oom-score-adj --pid --pids-limit diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 2e176db76..289bb71a3 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 sigil **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 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..e045d033c 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 sigil **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 conflicts with **--add-host**. + **--oom-kill-disable**=*true*|*false* Whether to disable OOM Killer for the container or not. |