containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add manpages and completions for dns=none and no-hosts 

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon 2019-03-25 12:24:46 -04:00
parent 236300d028
commit 323dc526ce
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
completions/bash/podman
View File

@ -1727,6 +1727,7 @@ _podman_container_run() {
--memory-reservation --memory-reservation
--name --name
--network --network
--no-hosts
--oom-score-adj --oom-score-adj
--pid --pid
--pids-limit --pids-limit

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

@ -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 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. 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**=[] **--dns-option**=[]
Set custom DNS options Set custom DNS options
@ -457,6 +460,13 @@ Set the Network mode for the container
Not implemented 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* **--oom-kill-disable**=*true*|*false*
Whether to disable OOM Killer for the container or not. Whether to disable OOM Killer for the container or not.

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

@ -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 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. 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**=[] **--dns-option**=[]
Set custom DNS options Set custom DNS options
@ -441,6 +444,13 @@ Set the Network mode for the container:
Not implemented 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* **--oom-kill-disable**=*true*|*false*
Whether to disable OOM Killer for the container or not. Whether to disable OOM Killer for the container or not.