зеркало из https://github.com/microsoft/docker.git
before adjusting should check whether need return or not
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
This commit is contained in:
Родитель
7ce97dbe30
Коммит
73d8af9319
|
@ -21,11 +21,12 @@ func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hos
|
|||
}
|
||||
|
||||
warnings, err := daemon.verifyContainerSettings(hostConfig, config)
|
||||
daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
|
||||
if err != nil {
|
||||
return nil, warnings, err
|
||||
}
|
||||
|
||||
daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
|
||||
|
||||
container, buildWarnings, err := daemon.Create(config, hostConfig, name)
|
||||
if err != nil {
|
||||
if daemon.Graph().IsNotExist(err, config.Image) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче