opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 13:38:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3914 from marcov/units-opts

Browse Source 
cli-flags: use a consistent format for <size><unit>
This commit is contained in:
OpenShift Merge Robot
2019-09-09 10:06:11 +02:00
committed by GitHub
parent f500feb2f1 5711aabb4d
commit d78521de11
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/podman-build.1.md
View File

@ -281,7 +281,7 @@ with 3 being roughly equivalent to using the global *--debug* option, and
values below 0 omitting even error messages which accompany fatal errors.
**--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

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

@ -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*

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

@ -390,7 +390,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
@ -432,7 +432,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
@ -442,7 +442,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
@ -683,9 +683,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.
**--sig-proxy**=*true|false*