opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-19 12:56:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4348 from rhatdan/man

Browse Source 
Cleanup man pages
This commit is contained in:
OpenShift Merge Robot
2019-10-27 16:02:15 +01:00
committed by GitHub
parent ea46937675 94087bade2
commit ac73fd3fe5
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docs/podman-create.1.md
View File

@ -515,13 +515,16 @@ This works for both background and foreground containers.
**--network**, **--net**="*bridge*" **--network**, **--net**="*bridge*"
Set the Network mode for the container. Invalid if using **--dns**, **--dns-option**, or **--dns-search** with **--network** that is set to 'none' or 'container:<name|id>'. Set the Network mode for the container. Invalid if using **--dns**, **--dns-option**, or **--dns-search** with **--network** that is set to 'none' or 'container:<name|id>'.
'bridge': create a network stack on the default bridge
'none': no networking Valid values are:
'container:<name|id>': reuse another container's network stack
'host': use the Podman host network stack. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure. - `bridge`: create a network stack on the default bridge
'<network-name>|<network-id>': connect to a user-defined network, multiple networks should be comma separated - `none`: no networking
'ns:<path>': path to a network namespace to join - `container:<name|id>`: reuse another container's network stack
'slirp4netns': use slirp4netns to create a user network stack. This is the default for rootless containers - `host`: use the Podman host network stack. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure.
- `<network-name>|<network-id>`: connect to a user-defined network, multiple networks should be comma separated
- `ns:<path>`: path to a network namespace to join
- `slirp4netns`: use slirp4netns to create a user network stack. This is the default for rootless containers
**--network-alias**=*alias* **--network-alias**=*alias*
@ -626,6 +629,7 @@ If container is running in --read-only mode, then mount a read-write tmpfs on /r
Restart policy to follow when containers exit. Restart policy to follow when containers exit.
Restart policy will not take effect if a container is stopped via the `podman kill` or `podman stop` commands. Restart policy will not take effect if a container is stopped via the `podman kill` or `podman stop` commands.
Valid values are: Valid values are:
- `no` : Do not restart containers on exit - `no` : Do not restart containers on exit

4
docs/podman-run.1.md
View File

@ -526,6 +526,9 @@ This works for both background and foreground containers.
**--network**, **--net**=*node* **--network**, **--net**=*node*
Set the Network mode for the container. Invalid if using **--dns**, **--dns-option**, or **--dns-search** with **--network** that is set to 'none' or 'container:<name|id>'. Set the Network mode for the container. Invalid if using **--dns**, **--dns-option**, or **--dns-search** with **--network** that is set to 'none' or 'container:<name|id>'.
Valid values are:
- `bridge`: create a network stack on the default bridge - `bridge`: create a network stack on the default bridge
- `none`: no networking - `none`: no networking
- `container:<name|id>`: reuse another container's network stack - `container:<name|id>`: reuse another container's network stack
@ -645,6 +648,7 @@ If container is running in --read-only mode, then mount a read-write tmpfs on /r
Restart policy to follow when containers exit. Restart policy to follow when containers exit.
Restart policy will not take effect if a container is stopped via the `podman kill` or `podman stop` commands. Restart policy will not take effect if a container is stopped via the `podman kill` or `podman stop` commands.
Valid values are: Valid values are:
- `no` : Do not restart containers on exit - `no` : Do not restart containers on exit