docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12941 from runcom/unused-return-error 

Remove unused error return
This commit is contained in:
Alexander Morozov 2015-05-02 09:12:59 -07:00
parent 3ea59f8991 4aff563282
commit ec534042aa
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/execdriver/native/create.go
View File

@ -65,9 +65,7 @@ func (d *driver) createContainer(c *execdriver.Command) (*configs.Config, error)
return nil, err
}
if err := d.setupLabels(container, c); err != nil {
return nil, err
}
d.setupLabels(container, c)
d.setupRlimits(container, c)
return container, nil
}
@ -254,9 +252,7 @@ func (d *driver) setupMounts(container *configs.Config, c *execdriver.Command) e
return nil
}
func (d *driver) setupLabels(container *configs.Config, c *execdriver.Command) error {
func (d *driver) setupLabels(container *configs.Config, c *execdriver.Command) {
container.ProcessLabel = c.ProcessLabel
container.MountLabel = c.MountLabel
return nil
}