diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-17 12:34:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 12:34:22 +0100 |
| commit | d7a547952cc0ddc7bcc017ec58e0832db7343c6d (patch) | |
| tree | b1af988aaf0efee774368129fddd7fbcbac238a5 | |
| parent | 3502860e1cfe1042aca7a8de8446360662a5a2fd (diff) | |
| parent | 31ceaf7bd4bfa31d33ba5410584de6184357c342 (diff) | |
| download | podman-d7a547952cc0ddc7bcc017ec58e0832db7343c6d.tar.gz podman-d7a547952cc0ddc7bcc017ec58e0832db7343c6d.tar.bz2 podman-d7a547952cc0ddc7bcc017ec58e0832db7343c6d.zip | |
Merge pull request #8367 from Luap99/docs-network-pod
[CI:DOCS] Explain the relation between --pod and --network
| -rw-r--r-- | docs/source/markdown/podman-create.1.md | 4 | ||||
| -rw-r--r-- | docs/source/markdown/podman-run.1.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md index a6083201d..9f2aa1d7b 100644 --- a/docs/source/markdown/podman-create.1.md +++ b/docs/source/markdown/podman-create.1.md @@ -574,9 +574,9 @@ to the container with **--name** then it will generate a random string name. The name is useful any place you need to identify a container. This works for both background and foreground containers. -#### **--network**=*bridge*, **--net** +#### **--network**=*mode*, **--net** -Set the network mode for the container. 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 container. Invalid if using **--dns**, **--dns-opt**, or **--dns-search** with **--network** that is set to **none** or **container:**_id_. If used together with **--pod**, the container will not join the pods network namespace. Valid _mode_ values are: diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md index db9c98073..8c7d713ac 100644 --- a/docs/source/markdown/podman-run.1.md +++ b/docs/source/markdown/podman-run.1.md @@ -602,7 +602,7 @@ This works for both background and foreground containers. #### **--network**=*mode*, **--net** -Set the network mode for the container. 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 container. Invalid if using **--dns**, **--dns-opt**, or **--dns-search** with **--network** that is set to **none** or **container:**_id_. If used together with **--pod**, the container will not join the pods network namespace. Valid _mode_ values are: |