[ARVADOS] created: 8347bb8e3b53ad91a4962e479c022a78c85c4cf9

[Git user]

        at  8347bb8e3b53ad91a4962e479c022a78c85c4cf9 (commit)


commit 8347bb8e3b53ad91a4962e479c022a78c85c4cf9
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed May 17 11:07:46 2017 -0400

    11714: Set CgroupParent under Resources because setting Cgroup in HostConfig
    doesn't work.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index de289dd..aea93df 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -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 {

-----------------------------------------------------------------------


hooks/post-receive
--