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

add check for memoryswap when create

Browse Source 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 72f356be6a662ed92e04ba9c58acac63c5a15264
Component: engine
This commit is contained in:
Qiang Huang
2015-01-23 11:29:21 +08:00
parent 7f4431424b
commit c3812a0984
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/daemon/create.go
View File

@ -33,6 +33,9 @@ func (daemon *Daemon) ContainerCreate(job *engine.Job) engine.Status {
if config.Memory > 0 && config.MemorySwap > 0 && config.MemorySwap < config.Memory {
return job.Errorf("Minimum memoryswap limit should be larger than memory limit, see usage.\n")
}
if config.Memory == 0 && config.MemorySwap > 0 {
return job.Errorf("You should always set the Memory limit when using Memoryswap limit, see usage.\n")
}
var hostConfig *runconfig.HostConfig
if job.EnvExists("HostConfig") {