diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-16 17:24:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-16 17:24:34 +0200 |
| commit | a9a1345cb02db1a34cb248221fb06ff523c1e25c (patch) | |
| tree | 3f088b2c4582fbe3eb812e7da63b6f551fb04e73 /docs | |
| parent | 4823c1b3f675c0f370b21d14ec437ce55300e97d (diff) | |
| parent | 21841dc381f252d447a00e2d4ca5082a5e80d0f7 (diff) | |
| download | podman-a9a1345cb02db1a34cb248221fb06ff523c1e25c.tar.gz podman-a9a1345cb02db1a34cb248221fb06ff523c1e25c.tar.bz2 podman-a9a1345cb02db1a34cb248221fb06ff523c1e25c.zip | |
Merge pull request #15823 from rhatdan/dns-opt
Default to --dns-option to match Docker and Buildah
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/markdown/options/dns-opt.container.md | 3 | ||||
| -rw-r--r-- | docs/source/markdown/options/dns-option.container.md | 3 | ||||
| -rw-r--r-- | docs/source/markdown/podman-create.1.md.in | 4 | ||||
| -rw-r--r-- | docs/source/markdown/podman-pod-create.1.md.in | 4 | ||||
| -rw-r--r-- | docs/source/markdown/podman-run.1.md.in | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/docs/source/markdown/options/dns-opt.container.md b/docs/source/markdown/options/dns-opt.container.md deleted file mode 100644 index ea26fd013..000000000 --- a/docs/source/markdown/options/dns-opt.container.md +++ /dev/null @@ -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_. diff --git a/docs/source/markdown/options/dns-option.container.md b/docs/source/markdown/options/dns-option.container.md new file mode 100644 index 000000000..cfbded5e6 --- /dev/null +++ b/docs/source/markdown/options/dns-option.container.md @@ -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_. diff --git a/docs/source/markdown/podman-create.1.md.in b/docs/source/markdown/podman-create.1.md.in index 72f167a7e..742a32b5a 100644 --- a/docs/source/markdown/podman-create.1.md.in +++ b/docs/source/markdown/podman-create.1.md.in @@ -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: diff --git a/docs/source/markdown/podman-pod-create.1.md.in b/docs/source/markdown/podman-pod-create.1.md.in index 7700f5e62..fdae1d249 100644 --- a/docs/source/markdown/podman-pod-create.1.md.in +++ b/docs/source/markdown/podman-pod-create.1.md.in @@ -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: diff --git a/docs/source/markdown/podman-run.1.md.in b/docs/source/markdown/podman-run.1.md.in index 37d052646..2109a0e33 100644 --- a/docs/source/markdown/podman-run.1.md.in +++ b/docs/source/markdown/podman-run.1.md.in @@ -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: |