toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18964 from hqhq/hq_fix_memory_swap_doc2

Browse Source 
Fix docs for memory-swap
Upstream-commit: 2c3d1a9b126d45647cfe8aa89008a93f83203a0c
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2015-12-30 21:01:48 +01:00
parent cd2f0504b4 c8d08c88b3
commit 301494dba6
8 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/api/client/build.go
View File

@ -49,7 +49,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
pull := cmd.Bool([]string{"-pull"}, false, "Always attempt to pull a newer version of the image")
dockerfileName := cmd.String([]string{"f", "-file"}, "", "Name of the Dockerfile (Default is 'PATH/Dockerfile')")
flMemoryString := cmd.String([]string{"m", "-memory"}, "", "Memory limit")
flMemorySwap := cmd.String([]string{"-memory-swap"}, "", "Total memory (memory + swap), '-1' to disable swap")
flMemorySwap := cmd.String([]string{"-memory-swap"}, "", "Swap limit equal to memory plus swap: '-1' to enable unlimited swap")
flShmSize := cmd.String([]string{"-shm-size"}, "", "Size of /dev/shm, default value is 64MB")
flCPUShares := cmd.Int64([]string{"#c", "-cpu-shares"}, 0, "CPU shares (relative weight)")
flCPUPeriod := cmd.Int64([]string{"-cpu-period"}, 0, "Limit the CPU CFS (Completely Fair Scheduler) period")