11714: Set CgroupParent under Resources because setting Cgroup in HostConfig 11714-crunch-run-cgroup-parent
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 17 May 2017 15:07:46 +0000 (11:07 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 17 May 2017 15:07:46 +0000 (11:07 -0400)
doesn't work.

services/crunch-run/crunchrun.go

index de289dd7185d45438a8e5244a3a1aa4304585bc2..aea93df1dc69970ce00d388aecfafc43e842a634 100644 (file)
@@ -800,11 +800,13 @@ func (runner *ContainerRunner) CreateContainer() error {
        runner.ContainerConfig.Volumes = runner.Volumes
 
        runner.HostConfig = dockercontainer.HostConfig{
-               Binds:  runner.Binds,
-               Cgroup: dockercontainer.CgroupSpec(runner.setCgroupParent),
+               Binds: runner.Binds,
                LogConfig: dockercontainer.LogConfig{
                        Type: "none",
                },
+               Resources: dockercontainer.Resources{
+                       CgroupParent: runner.setCgroupParent,
+               },
        }
 
        if wantAPI := runner.Container.RuntimeConstraints.API; wantAPI != nil && *wantAPI {