瀏覽代碼

Merge pull request #15369 from coolljt0725/adapt_container_settings_after_verify

Adapt container settings after verify platform container settings.
David Calavera 10 年之前
父節點
當前提交
33ed76b0f7
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      daemon/create.go

+ 1 - 1
daemon/create.go

@@ -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")
 		return "", nil, fmt.Errorf("Config cannot be empty in order to create a container")
 	}
 	}
 
 
-	daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
 	warnings, err := daemon.verifyContainerSettings(hostConfig, config)
 	warnings, err := daemon.verifyContainerSettings(hostConfig, config)
+	daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
 	if err != nil {
 	if err != nil {
 		return "", warnings, err
 		return "", warnings, err
 	}
 	}