opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14467 from karthikelango137/bytes

Browse Source 
[CI:DOCS] changed megabyte to mebibyte
This commit is contained in:
OpenShift Merge Robot
2022-06-02 19:59:25 -04:00
committed by GitHub
parent 2777ecd53e 9a34b88c9a
commit 38720d91af
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/common/create.go
View File

@ -12,7 +12,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
const sizeWithUnitFormat = "(format: `<number>[<unit>]`, where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))" const sizeWithUnitFormat = "(format: `<number>[<unit>]`, where unit = b (bytes), k (kibibytes), m (mebibytes), or g (gibibytes))"
var containerConfig = registry.PodmanConfig() var containerConfig = registry.PodmanConfig()

10
docs/source/markdown/podman-build.1.md
View File

@ -435,8 +435,8 @@ if it does not exist. This option is useful for building multi architecture imag
#### **--memory**, **-m**=*LIMIT* #### **--memory**, **-m**=*LIMIT*
Memory limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kilobytes), Memory limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kibibytes),
m (megabytes), or g (gigabytes)) m (mebibytes), or g (gibibytes))
Allows you to constrain the memory available to a container. If the host 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 supports swap memory, then the **-m** memory setting can be larger than physical
@ -453,7 +453,7 @@ A limit value equal to memory plus swap. Must be used with the **-m**
the value of --memory. the value of --memory.
The format of `LIMIT` is `<number>[<unit>]`. Unit can be `b` (bytes), The format of `LIMIT` is `<number>[<unit>]`. Unit can be `b` (bytes),
`k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you don't specify a `k` (kibibytes), `m` (mebibytes), or `g` (gibibytes). If you don't specify a
unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap. unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
#### **--network**=*mode*, **--net** #### **--network**=*mode*, **--net**
@ -631,8 +631,8 @@ as a seccomp filter
Size of `/dev/shm`. The format is `<number><unit>`. `number` must be greater Size of `/dev/shm`. The format is `<number><unit>`. `number` must be greater
than `0`. than `0`.
Unit is optional and can be `b` (bytes), `k` (kilobytes), `m`(megabytes), or Unit is optional and can be `b` (bytes), `k` (kibibytes), `m`(mebibytes), or
`g` (gigabytes). If you omit the unit, the system uses bytes. If you omit the `g` (gibibytes). If you omit the unit, the system uses bytes. If you omit the
size entirely, the system uses `64m`. size entirely, the system uses `64m`.
#### **--sign-by**=*fingerprint* #### **--sign-by**=*fingerprint*

6
docs/source/markdown/podman-container-clone.1.md
View File

@ -131,7 +131,7 @@ Force removal of the original container that we are cloning. Can only be used in
#### **--memory**, **-m**=*limit* #### **--memory**, **-m**=*limit*
Memory limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes)) Memory limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kibibytes), m (mebibytes), or g (gibibytes))
Allows the memory available to a container to be constrained. If the host Allows the memory available to a container to be constrained. If the host
supports swap memory, then the **-m** memory setting can be larger than physical supports swap memory, then the **-m** memory setting can be larger than physical
@ -143,7 +143,7 @@ If no memory limits are specified, the original container's will be used.
#### **--memory-reservation**=*limit* #### **--memory-reservation**=*limit*
Memory soft limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes)) Memory soft limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kibibytes), m (mebibytes), or g (gibibytes))
After setting memory reservation, when the system detects memory contention After setting memory reservation, when the system detects memory contention
or low memory, containers are forced to restrict their consumption to their or low memory, containers are forced to restrict their consumption to their
@ -159,7 +159,7 @@ A limit value equal to memory plus swap. Must be used with the **-m**
the value of --memory if specified. Otherwise, the container being cloned will be used to derive the swap value. the value of --memory if specified. Otherwise, the container being cloned will be used to derive the swap value.
The format of `LIMIT` is `<number>[<unit>]`. Unit can be `b` (bytes), The format of `LIMIT` is `<number>[<unit>]`. Unit can be `b` (bytes),
`k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you don't specify a `k` (kibibytes), `m` (mebibytes), or `g` (gibibytes). If you don't specify a
unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap. unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
#### **--memory-swappiness**=*number* #### **--memory-swappiness**=*number*

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

@ -573,7 +573,7 @@ To specify multiple static MAC addresses per container, set multiple networks us
#### **--memory**, **-m**=*limit* #### **--memory**, **-m**=*limit*
Memory limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes)) Memory limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kibibytes), m (mebibytes), or g (gibibytes))
Allows you to constrain the memory available to a container. If the host 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 supports swap memory, then the **-m** memory setting can be larger than physical
@ -583,7 +583,7 @@ system's page size (the value would be very large, that's millions of trillions)
#### **--memory-reservation**=*limit* #### **--memory-reservation**=*limit*
Memory soft limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes)) Memory soft limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kibibytes), m (mebibytes), or g (gibibytes))
After setting memory reservation, when the system detects memory contention After setting memory reservation, when the system detects memory contention
or low memory, containers are forced to restrict their consumption to their or low memory, containers are forced to restrict their consumption to their
@ -599,7 +599,7 @@ A limit value equal to memory plus swap. Must be used with the **-m**
the value of --memory. the value of --memory.
The format of `LIMIT` is `<number>[<unit>]`. Unit can be `b` (bytes), The format of `LIMIT` is `<number>[<unit>]`. Unit can be `b` (bytes),
`k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you don't specify a `k` (kibibytes), `m` (mebibytes), or `g` (gibibytes). If you don't specify a
unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap. unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
#### **--memory-swappiness**=*number* #### **--memory-swappiness**=*number*
@ -1013,7 +1013,7 @@ Note: Labeling can be disabled for all containers by setting label=false in the
#### **--shm-size**=*size* #### **--shm-size**=*size*
Size of `/dev/shm` (format: `<number>[<unit>]`, where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes)) Size of `/dev/shm` (format: `<number>[<unit>]`, where unit = b (bytes), k (kibibytes), m (mebibytes), or g (gibibytes))
If you omit the unit, the system uses bytes. If you omit the size entirely, the system uses `64m`. 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. When size is `0`, there is no limit on the amount of memory used for IPC by the container.

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

@ -597,7 +597,7 @@ To specify multiple static MAC addresses per container, set multiple networks us
#### **--memory**, **-m**=_number_[_unit_] #### **--memory**, **-m**=_number_[_unit_]
Memory limit. A _unit_ can be **b** (bytes), **k** (kilobytes), **m** (megabytes), or **g** (gigabytes). Memory limit. A _unit_ can be **b** (bytes), **k** (kibibytes), **m** (mebibytes), or **g** (gibibytes).
Allows you to constrain the memory available to a container. If the host 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 supports swap memory, then the **-m** memory setting can be larger than physical
@ -607,7 +607,7 @@ system's page size (the value would be very large, that's millions of trillions)
#### **--memory-reservation**=_number_[_unit_] #### **--memory-reservation**=_number_[_unit_]
Memory soft limit. A _unit_ can be **b** (bytes), **k** (kilobytes), **m** (megabytes), or **g** (gigabytes). Memory soft limit. A _unit_ can be **b** (bytes), **k** (kibibytes), **m** (mebibytes), or **g** (gibibytes).
After setting memory reservation, when the system detects memory contention After setting memory reservation, when the system detects memory contention
or low memory, containers are forced to restrict their consumption to their or low memory, containers are forced to restrict their consumption to their
@ -618,7 +618,7 @@ as memory limit.
#### **--memory-swap**=_number_[_unit_] #### **--memory-swap**=_number_[_unit_]
A limit value equal to memory plus swap. A limit value equal to memory plus swap.
A _unit_ can be **b** (bytes), **k** (kilobytes), **m** (megabytes), or **g** (gigabytes). A _unit_ can be **b** (bytes), **k** (kibibytes), **m** (mebibytes), or **g** (gibibytes).
Must be used with the **-m** (**--memory**) flag. Must be used with the **-m** (**--memory**) flag.
The argument value should always be larger than that of The argument value should always be larger than that of
@ -1058,7 +1058,7 @@ Note: Labeling can be disabled for all containers by setting **label=false** in
#### **--shm-size**=_number_[_unit_] #### **--shm-size**=_number_[_unit_]
Size of _/dev/shm_. A _unit_ can be **b** (bytes), **k** (kilobytes), **m** (megabytes), or **g** (gigabytes). Size of _/dev/shm_. A _unit_ can be **b** (bytes), **k** (kibibytes), **m** (mebibytes), or **g** (gibibytes).
If you omit the unit, the system uses bytes. If you omit the size entirely, the default is **64m**. If you omit the unit, the system uses bytes. If you omit the size entirely, the default is **64m**.
When _size_ is **0**, there is no limit on the amount of memory used for IPC by the container. When _size_ is **0**, there is no limit on the amount of memory used for IPC by the container.