opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 09:36:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15823 from rhatdan/dns-opt

Browse Source 
Default to --dns-option to match Docker and Buildah
This commit is contained in:
OpenShift Merge Robot
2022-09-16 17:24:34 +02:00
committed by GitHub
parent 4823c1b3f6 21841dc381
commit a9a1345cb0
11 changed files with 19 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/source/markdown/options/dns-opt.container.md
View File

@ -1,3 +0,0 @@
#### **--dns-opt**=*option*
Set custom DNS options. Invalid if using **--dns-opt** with **--network** that is set to **none** or **container:**_id_.

3
docs/source/markdown/options/dns-option.container.md Normal file
View File

@ -0,0 +1,3 @@
#### **--dns-option**=*option*
Set custom DNS options. Invalid if using **--dns-option** with **--network** that is set to **none** or **container:**_id_.

4
docs/source/markdown/podman-create.1.md.in
View File

@ -145,7 +145,7 @@ flag to pass the user's supplementary group access into the container.
This option cannot be combined with **--network** that is set to **none** or **container:**_id_.
@@option dns-opt.container
@@option dns-option.container
@@option dns-search.container
@ -265,7 +265,7 @@ This option is currently supported only by the **journald** log driver.
#### **--network**=*mode*, **--net**
Set the network mode for the container. Invalid if using **--dns**, **--dns-opt**, or **--dns-search** with **--network** set to **none** or **container:**_id_. If used together with **--pod**, the container will not join the pod's network namespace.
Set the network mode for the container. Invalid if using **--dns**, **--dns-option**, or **--dns-search** with **--network** set to **none** or **container:**_id_. If used together with **--pod**, the container will not join the pod's network namespace.
Valid _mode_ values are:

4
docs/source/markdown/podman-pod-create.1.md.in
View File

@ -60,7 +60,7 @@ Note: the pod implements devices by storing the initial configuration passed by
Set custom DNS servers in the /etc/resolv.conf file that will be shared between all containers in the pod. A special option, "none" is allowed which disables creation of /etc/resolv.conf for the pod.
#### **--dns-opt**=*option*
#### **--dns-option**=*option*
Set custom DNS options in the /etc/resolv.conf file that will be shared between all containers in the pod.
@ -119,7 +119,7 @@ Assign a name to the pod.
#### **--network**=*mode*, **--net**
Set the network mode for the pod. Invalid if using **--dns**, **--dns-opt**, or **--dns-search** with **--network** that is set to **none** or **container:**_id_.
Set the network mode for the pod. Invalid if using **--dns**, **--dns-option**, or **--dns-search** with **--network** that is set to **none** or **container:**_id_.
Valid _mode_ values are:

4
docs/source/markdown/podman-run.1.md.in
View File

@ -181,7 +181,7 @@ flag to pass the user's supplementary group access into the container.
This option cannot be combined with **--network** that is set to **none** or **container:**_id_.
@@option dns-opt.container
@@option dns-option.container
@@option dns-search.container
@ -286,7 +286,7 @@ This option is currently supported only by the **journald** log driver.
#### **--network**=*mode*, **--net**
Set the network mode for the container. Invalid if using **--dns**, **--dns-opt**, or **--dns-search** with **--network** set to **none** or **container:**_id_. If used together with **--pod**, the container will not join the pod's network namespace.
Set the network mode for the container. Invalid if using **--dns**, **--dns-option**, or **--dns-search** with **--network** set to **none** or **container:**_id_. If used together with **--pod**, the container will not join the pod's network namespace.
Valid _mode_ values are: