containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6106 from mheon/fix_manpages 

[CI:DOCS] Update manpages for image volumes and MAC address
This commit is contained in:
OpenShift Merge Robot 2020-05-08 19:42:09 +02:00 committed by GitHub
parent 96dd504671 344084430e
commit 428246d4e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/source/markdown/podman-create.1.md
View File

@ -358,12 +358,12 @@ Defaults to `true`
**--image-volume**, **builtin-volume**=*bind|tmpfs|ignore*
Tells Podman how to handle the builtin image volumes. The options are: 'bind', 'tmpfs', or 'ignore' (default 'bind').
bind: A directory is created inside the container state directory and bind mounted into
the container for the volumes.
tmpfs: The volume is mounted onto the container as a tmpfs, which allows the users to create
Tells Podman how to handle the builtin image volumes. Default is **bind**.
- **bind**: An anonymous named volume will be created and mounted into the container.
- **tmpfs**: The volume is mounted onto the container as a tmpfs, which allows the users to create
content that disappears when the container is stopped.
ignore: All volumes are just ignored and no action is taken.
- **ignore**: All volumes are just ignored and no action is taken.
**--init**
@ -445,8 +445,6 @@ Remember that the MAC address in an Ethernet network must be unique.
The IPv6 link-local address will be based on the device's MAC address
according to RFC4862.
Not currently supported
**--memory**, **-m**=*limit*
Memory limit (format: <number>[<unit>], where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))

5
docs/source/markdown/podman-run.1.md
View File

@ -371,8 +371,7 @@ Defaults to **true**.
Tells Podman how to handle the builtin image volumes. Default is **bind**.
- **bind**: A directory is created inside the container state directory and bind mounted into
the container for the volumes.
- **bind**: An anonymous named volume will be created and mounted into the container.
- **tmpfs**: The volume is mounted onto the container as a tmpfs, which allows the users to create
content that disappears when the container is stopped.
- **ignore**: All volumes are just ignored and no action is taken.
@ -454,8 +453,6 @@ Remember that the MAC address in an Ethernet network must be unique.
The IPv6 link-local address will be based on the device's MAC address
according to RFC4862.
Not currently supported
**--memory**, **-m**=_number_[_unit_]
Memory limit. A _unit_ can be **b** (bytes), **k** (kilobytes), **m** (megabytes), or **g** (gigabytes).