kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #16110 from Mashimiao/daemon-create-fix-return-and-adjust

Browse source 
before adjusting should check whether need return or not
This commit is contained in:
David Calavera 2015-09-07 09:16:23 -07:00
commit c1c4ccefcd
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/create.go
View file

@ -21,11 +21,12 @@ func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hos
} }
warnings, err := daemon.verifyContainerSettings(hostConfig, config) warnings, err := daemon.verifyContainerSettings(hostConfig, config)
daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
if err != nil { if err != nil {
return nil, warnings, err return nil, warnings, err
} }
daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
container, buildWarnings, err := daemon.Create(config, hostConfig, name) container, buildWarnings, err := daemon.Create(config, hostConfig, name)
if err != nil { if err != nil {
if daemon.Graph().IsNotExist(err, config.Image) { if daemon.Graph().IsNotExist(err, config.Image) {