1. docker
  2. Commit 08b3dc8d9f11e42e1ef6dc7a5b5ee70dd5b55306
Browse code

Adapt container settings after verify platform container settings.

Signed-off-by: Lei Jitang <leijitang@huawei.com>

Lei Jitang authored on 2015/08/06 20:56:51
Showing 1 changed files
daemon/create.go
History View file @ 08b3dc8
... ... 
@@ -16,8 +16,8 @@ func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hos
16 16 
 		return "", nil, fmt.Errorf("Config cannot be empty in order to create a container")
17 17 
 	}
18 18
19 
-	daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
20 19 
 	warnings, err := daemon.verifyContainerSettings(hostConfig, config)
20 
+	daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
21 21 
 	if err != nil {
22 22 
 		return "", warnings, err
23 23 
 	}