Adapt container settings after verify platform container settings.

Signed-off-by: Lei Jitang <leijitang@huawei.com> Upstream-commit: 08b3dc8d9f11e42e1ef6dc7a5b5ee70dd5b55306 Component: engine
2015-08-06 19:56:51 +08:00
parent 70f70bf8d8
commit 18046b8656
1 changed files with 1 additions and 1 deletions
@@ -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
 	}