mirror of https://github.com/docker/cli.git
adding -c option for docker run/build in manpages
Signed-off-by: Vaclav Struhar <struharv@gmail.com>
(cherry picked from commit be219b3172
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
6efe73abe0
commit
d9770a962e
|
@ -8,7 +8,7 @@ docker-build - Build an image from a Dockerfile
|
||||||
[**--add-host**[=*[]*]]
|
[**--add-host**[=*[]*]]
|
||||||
[**--build-arg**[=*[]*]]
|
[**--build-arg**[=*[]*]]
|
||||||
[**--cache-from**[=*[]*]]
|
[**--cache-from**[=*[]*]]
|
||||||
[**--cpu-shares**[=*0*]]
|
[**-c**|**--cpu-shares**[=*0*]]
|
||||||
[**--cgroup-parent**[=*CGROUP-PARENT*]]
|
[**--cgroup-parent**[=*CGROUP-PARENT*]]
|
||||||
[**--help**]
|
[**--help**]
|
||||||
[**--iidfile**[=*CIDFILE*]]
|
[**--iidfile**[=*CIDFILE*]]
|
||||||
|
@ -153,7 +153,7 @@ In Linux, default is **bridge**.
|
||||||
Unit is optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you omit the unit, the system uses bytes.
|
Unit is optional and can be `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`.
|
If you omit the size entirely, the system uses `64m`.
|
||||||
|
|
||||||
**--cpu-shares** *0*
|
**-c**, **--cpu-shares** *0*
|
||||||
CPU shares (relative weight).
|
CPU shares (relative weight).
|
||||||
|
|
||||||
By default, all containers get the same proportion of CPU cycles.
|
By default, all containers get the same proportion of CPU cycles.
|
||||||
|
@ -166,7 +166,7 @@ In Linux, default is **bridge**.
|
||||||
You can change this proportion by adjusting the container's CPU share
|
You can change this proportion by adjusting the container's CPU share
|
||||||
weighting relative to the weighting of all other running containers.
|
weighting relative to the weighting of all other running containers.
|
||||||
|
|
||||||
To modify the proportion from the default of 1024, use the **--cpu-shares**
|
To modify the proportion from the default of 1024, use the **-c** or **--cpu-shares**
|
||||||
flag to set the weighting to 2 or higher.
|
flag to set the weighting to 2 or higher.
|
||||||
|
|
||||||
Container CPU share Flag
|
Container CPU share Flag
|
||||||
|
|
|
@ -10,7 +10,7 @@ docker-run - Create and run a new container from an image
|
||||||
[**--annotation**[=*[]*]]
|
[**--annotation**[=*[]*]]
|
||||||
[**--blkio-weight**[=*[BLKIO-WEIGHT]*]]
|
[**--blkio-weight**[=*[BLKIO-WEIGHT]*]]
|
||||||
[**--blkio-weight-device**[=*[]*]]
|
[**--blkio-weight-device**[=*[]*]]
|
||||||
[**--cpu-shares**[=*0*]]
|
[**-c**|**--cpu-shares**[=*0*]]
|
||||||
[**--cap-add**[=*[]*]]
|
[**--cap-add**[=*[]*]]
|
||||||
[**--cap-drop**[=*[]*]]
|
[**--cap-drop**[=*[]*]]
|
||||||
[**--cgroupns**[=*[]*]]
|
[**--cgroupns**[=*[]*]]
|
||||||
|
@ -137,14 +137,14 @@ option can be set multiple times.
|
||||||
**--blkio-weight-device**=[]
|
**--blkio-weight-device**=[]
|
||||||
Block IO weight (relative device weight, format: `DEVICE_NAME:WEIGHT`).
|
Block IO weight (relative device weight, format: `DEVICE_NAME:WEIGHT`).
|
||||||
|
|
||||||
**--cpu-shares**=*0*
|
**-c**, **--cpu-shares**=*0*
|
||||||
CPU shares (relative weight)
|
CPU shares (relative weight)
|
||||||
|
|
||||||
By default, all containers get the same proportion of CPU cycles. This proportion
|
By default, all containers get the same proportion of CPU cycles. This proportion
|
||||||
can be modified by changing the container's CPU share weighting relative
|
can be modified by changing the container's CPU share weighting relative
|
||||||
to the weighting of all other running containers.
|
to the weighting of all other running containers.
|
||||||
|
|
||||||
To modify the proportion from the default of 1024, use the **--cpu-shares**
|
To modify the proportion from the default of 1024, use the **-c** or **--cpu-shares**
|
||||||
flag to set the weighting to 2 or higher.
|
flag to set the weighting to 2 or higher.
|
||||||
|
|
||||||
The proportion will only apply when CPU-intensive processes are running.
|
The proportion will only apply when CPU-intensive processes are running.
|
||||||
|
|
Loading…
Reference in New Issue