summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/podman-container-runlabel.1.md21
-rw-r--r--docs/podman-create.1.md6
-rw-r--r--docs/podman-run.1.md6
3 files changed, 27 insertions, 6 deletions
diff --git a/docs/podman-container-runlabel.1.md b/docs/podman-container-runlabel.1.md
index 889a5fb03..4611aa4d9 100644
--- a/docs/podman-container-runlabel.1.md
+++ b/docs/podman-container-runlabel.1.md
@@ -28,8 +28,8 @@ If the container image has a LABEL INSTALL instruction like the following:
Note: Podman will always ensure that `podman` is the first argument of the command being executed.
-**NAME**
-The name specified via the command. NAME will be replaced with IMAGE if it is not specified.
+**LABEL**
+The label name specified via the command.
**IMAGE**
Image name specified via the command.
@@ -95,6 +95,23 @@ Require HTTPS and verify certificates when contacting registries (default: true)
then tls verification will be used, If set to false then tls verification will not be used. If not specified
tls verification will be used unless the target registry is listed as an insecure registry in registries.conf
+## Examples ##
+
+Execute the run label of an image called foobar.
+```
+$ sudo podman container runlabel run foobar
+```
+
+Execute the install label of an image called foobar with additional arguments.
+```
+$ sudo podman container runlabel install foobar apples oranges
+```
+
+Display the command that would be executed by runlabel.
+```
+$ sudo podman container runlabel --display run foobar
+```
+
## SEE ALSO
podman(1)
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md
index c42671b76..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**=""
@@ -416,7 +418,7 @@ to the container with **--name** then the daemon will also 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**="*bridge*"
Set the Network mode for the container
'bridge': create a network stack on the default bridge
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index fccebb7f7..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**=""
@@ -401,7 +403,7 @@ to the container with **--name** then the daemon will also 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**="*bridge*"
Set the Network mode for the container:
- `bridge`: create a network stack on the default bridge