Merge pull request #15369 from coolljt0725/adapt_container_settings_after_verify

Adapt container settings after verify platform container settings. Upstream-commit: 33ed76b0f79e639e9ad3d35ee39afa3d9216c500 Component: engine
2015-08-06 10:16:54 -07:00
parent 973372c692 18046b8656
commit 79a2fad9ef
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
 	}