rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-07 11:58:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #312 from imikushin/fix-container-npe

Browse Source 
prevent `nil` from being put back to `c.Container`
This commit is contained in:
Darren Shepherd 2015-05-22 10:51:31 -07:00
commit 0b3b4a317b
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/container.go
View File

@ -529,7 +529,6 @@ func (c *Container) start(createOnly, wait bool) *Container {
return c.returnErr(err) return c.returnErr(err)
} }
container := c.Container
created := false created := false
opts, err := c.getCreateOpts(client) opts, err := c.getCreateOpts(client)
@ -563,15 +562,13 @@ func (c *Container) start(createOnly, wait bool) *Container {
return c.returnErr(err) return c.returnErr(err)
} }
container, err = client.CreateContainer(*opts) c.Container, err = client.CreateContainer(*opts)
created = true created = true
if err != nil { if err != nil {
return c.returnErr(err) return c.returnErr(err)
} }
} }
c.Container = container
hostConfig := c.Container.HostConfig hostConfig := c.Container.HostConfig
if created { if created {
hostConfig = opts.HostConfig hostConfig = opts.HostConfig