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

Remove dupl setting of OOMScoreAdj in OCI spec

Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2017-11-01 11:01:43 -07:00
parent be6a523bb9
commit f0b44881b5

View file

@ -755,7 +755,6 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
if err := setResources(&s, c.HostConfig.Resources); err != nil { if err := setResources(&s, c.HostConfig.Resources); err != nil {
return nil, fmt.Errorf("linux runtime spec resources: %v", err) return nil, fmt.Errorf("linux runtime spec resources: %v", err)
} }
s.Process.OOMScoreAdj = &c.HostConfig.OomScoreAdj
s.Linux.Sysctl = c.HostConfig.Sysctls s.Linux.Sysctl = c.HostConfig.Sysctls
p := s.Linux.CgroupsPath p := s.Linux.CgroupsPath