docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15369 from coolljt0725/adapt_container_settings_after_verify 

Adapt container settings after verify platform container settings.
This commit is contained in:
David Calavera 2015-08-06 10:16:54 -07:00
parent 4640c4abe8 08b3dc8d9f
commit 33ed76b0f7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/create.go
View File

@ -16,8 +16,8 @@ func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hos
return "", nil, fmt.Errorf("Config cannot be empty in order to create a container")
}
daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
warnings, err := daemon.verifyContainerSettings(hostConfig, config)
daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
if err != nil {
return "", warnings, err
}