diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-08 19:42:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 19:42:09 +0200 |
| commit | 428246d4e48a5b3ac1c499fed8d82276195a4ec9 (patch) | |
| tree | 9664cfbb4ac56757204668c7168d32991a78bb52 /docs/source/markdown | |
| parent | 96dd5046710a56f5624642801459f4b6ad3b3b3f (diff) | |
| parent | 344084430ee72b25e93a7b73f09aa36747c1aa47 (diff) | |
| download | podman-428246d4e48a5b3ac1c499fed8d82276195a4ec9.tar.gz podman-428246d4e48a5b3ac1c499fed8d82276195a4ec9.tar.bz2 podman-428246d4e48a5b3ac1c499fed8d82276195a4ec9.zip | |
Merge pull request #6106 from mheon/fix_manpages
[CI:DOCS] Update manpages for image volumes and MAC address
Diffstat (limited to 'docs/source/markdown')
| -rw-r--r-- | docs/source/markdown/podman-create.1.md | 12 | ||||
| -rw-r--r-- | docs/source/markdown/podman-run.1.md | 5 |
2 files changed, 6 insertions, 11 deletions
diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md index 2fd8512a6..475634fde 100644 --- a/docs/source/markdown/podman-create.1.md +++ b/docs/source/markdown/podman-create.1.md @@ -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)) diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md index dd221590d..4c236b520 100644 --- a/docs/source/markdown/podman-run.1.md +++ b/docs/source/markdown/podman-run.1.md @@ -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). |