diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-01 15:37:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 15:37:19 +0200 |
| commit | 2c6016f330b2738d2545f7d353244dfc8b239050 (patch) | |
| tree | a2a43be987ac21497b719d90888783e8d177160f /docs | |
| parent | 22713d62e2860052e21e5e985fba169834709fdc (diff) | |
| parent | eb9788db2337354dc74d0d653723c587172d049e (diff) | |
| download | podman-2c6016f330b2738d2545f7d353244dfc8b239050.tar.gz podman-2c6016f330b2738d2545f7d353244dfc8b239050.tar.bz2 podman-2c6016f330b2738d2545f7d353244dfc8b239050.zip | |
Merge pull request #6438 from rhatdan/man
[CI:DOCS] Update man pages for --ip with CNI networks
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/markdown/podman-create.1.md | 7 | ||||
| -rw-r--r-- | docs/source/markdown/podman-run.1.md | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md index 3a6077832..a69ef04d1 100644 --- a/docs/source/markdown/podman-create.1.md +++ b/docs/source/markdown/podman-create.1.md @@ -383,9 +383,10 @@ Not implemented **--ip**=*ip* -Specify a static IP address for the container, for example '10.88.64.128'. -Can only be used if no additional CNI networks to join were specified via '--network=<network-name>', and if the container is not joining another container's network namespace via '--network=container:<name|id>'. -The address must be within the default CNI network's pool (default 10.88.0.0/16). +Specify a static IP address for the container, for example **10.88.64.128**. +This option can only be used if the container is joined to only a single network - i.e., `--network=_network-name_` is used at most once - +and if the container is not joining another container's network namespace via `--network=container:_id_`. +The address must be within the CNI network's IP address pool (default **10.88.0.0/16**). **--ipc**=*ipc* diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md index 1e05b8999..02db8b205 100644 --- a/docs/source/markdown/podman-run.1.md +++ b/docs/source/markdown/podman-run.1.md @@ -395,9 +395,9 @@ Not implemented. **--ip**=*ip* Specify a static IP address for the container, for example **10.88.64.128**. -Can only be used if no additional CNI networks to join were specified via **--network=**_network-name_, -and if the container is not joining another container's network namespace via **--network=container:**_id_. -The address must be within the default CNI network's pool (default **10.88.0.0/16**). +This option can only be used if the container is joined to only a single network - i.e., `--network=_network-name_` is used at most once +and if the container is not joining another container's network namespace via `--network=container:_id_`. +The address must be within the CNI network's IP address pool (default **10.88.0.0/16**). **--ipc**=*mode* |