summaryrefslogtreecommitdiff
path: root/docs/podman-create.1.md
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-09-09 10:06:11 +0200
committerGitHub <noreply@github.com>2019-09-09 10:06:11 +0200
commitd78521de11c524d7b8ceee02b726f66da6d3301c (patch)
treea0253ffa13b7c3793f156b6e5f35e12908211ebb /docs/podman-create.1.md
parentf500feb2f19b88592211841e4b30fe16a9aa30b3 (diff)
parent5711aabb4d9d705a09085eb6e324ee5dae8ed487 (diff)
downloadpodman-d78521de11c524d7b8ceee02b726f66da6d3301c.tar.gz
podman-d78521de11c524d7b8ceee02b726f66da6d3301c.tar.bz2
podman-d78521de11c524d7b8ceee02b726f66da6d3301c.zip
Merge pull request #3914 from marcov/units-opts
cli-flags: use a consistent format for <size><unit>
Diffstat (limited to 'docs/podman-create.1.md')
-rw-r--r--docs/podman-create.1.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md
index cee9a1640..9924e7dff 100644
--- a/docs/podman-create.1.md
+++ b/docs/podman-create.1.md
@@ -379,7 +379,7 @@ Default is to create a private IPC namespace (POSIX SysV IPC) for the container
**--kernel-memory**=*number[unit]*
-Kernel memory limit (format: `<number>[<unit>]`, where unit = b, k, m or g)
+Kernel memory limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))
Constrains the kernel memory available to a container. If a limit of 0
is specified (not using `--kernel-memory`), the container's kernel memory
@@ -421,7 +421,7 @@ Not currently supported
**--memory**, **-m**=*limit*
-Memory limit (format: <number>[<unit>], where unit = b, k, m or g)
+Memory limit (format: <number>[<unit>], where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))
Allows you to constrain the memory available to a container. If the host
supports swap memory, then the **-m** memory setting can be larger than physical
@@ -431,7 +431,7 @@ system's page size (the value would be very large, that's millions of trillions)
**--memory-reservation**=*limit*
-Memory soft limit (format: <number>[<unit>], where unit = b, k, m or g)
+Memory soft limit (format: <number>[<unit>], where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))
After setting memory reservation, when the system detects memory contention
or low memory, containers are forced to restrict their consumption to their
@@ -661,9 +661,9 @@ Note: Labeling can be disabled for all containers by setting label=false in the
**--shm-size**=*size*
-Size of `/dev/shm`. The format is `<number><unit>`. `number` must be greater than `0`.
-Unit is optional and can be `b` (bytes), `k` (kilobytes), `m`(megabytes), or `g` (gigabytes).
+Size of `/dev/shm` (format: <number>[<unit>], where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))
If you omit the unit, the system uses bytes. If you omit the size entirely, the system uses `64m`.
+When size is `0`, there is no limit on the amount of memory used for IPC by the container.
**--stop-signal**=*SIGTERM*