summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-10-11 10:40:37 -0700
committerGitHub <noreply@github.com>2018-10-11 10:40:37 -0700
commit6983e00a2808b29481d1cb460aab2eea1db6ef73 (patch)
tree2ee6bc368cc698e13d5dd5249061ecd2e2f93f6e /docs
parent3c23bfca807eab55c145092c73dd8eb1e6599f38 (diff)
parent112e1402c9e2ee29a387cd84a973471c1888e4b9 (diff)
downloadpodman-6983e00a2808b29481d1cb460aab2eea1db6ef73.tar.gz
podman-6983e00a2808b29481d1cb460aab2eea1db6ef73.tar.bz2
podman-6983e00a2808b29481d1cb460aab2eea1db6ef73.zip
Merge pull request #1623 from mheon/static_ip
Add ability to specify static IPs with --ip flag
Diffstat (limited to 'docs')
-rw-r--r--docs/podman-create.1.md4
-rw-r--r--docs/podman-run.1.md4
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md
index 167fce5b9..509d8820f 100644
--- a/docs/podman-create.1.md
+++ b/docs/podman-create.1.md
@@ -286,7 +286,9 @@ Not implemented
**--ip**=""
-Not implemented
+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).
**--ipc**=""
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index b70396a6d..c303492e7 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -297,7 +297,9 @@ Not implemented
**--ip**=""
-Not implemented
+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).
**--ipc**=""