diff options
| author | Matthew Heon <mheon@redhat.com> | 2020-05-08 15:50:35 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-31 06:02:34 -0400 |
| commit | eb9788db2337354dc74d0d653723c587172d049e (patch) | |
| tree | 2e7cc24e2b9351464c363ad3cf5377825d428e52 | |
| parent | 0eea051b92da367469848aac93657653e004a603 (diff) | |
| download | podman-eb9788db2337354dc74d0d653723c587172d049e.tar.gz podman-eb9788db2337354dc74d0d653723c587172d049e.tar.bz2 podman-eb9788db2337354dc74d0d653723c587172d049e.zip | |
Update man pages for --ip with CNI networks
Originally, we did not allow this, and the manpage reflects that.
We added support with 1.7.0, but did not update the manpage. Fix
the manpages so they are once again accurate.
Signed-off-by: Matthew Heon <mheon@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| -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* |