[ARVADOS] updated: 867c69d1443b44311ab35f58304b304750c38066

[Git user]

Summary of changes:
 services/crunch-run/crunchrun.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

       via  867c69d1443b44311ab35f58304b304750c38066 (commit)
       via  7a4bee5299767c8491bdfe7efaa8a936f2c2bf6a (commit)
      from  f0e917d2305c66cb7120125aaf6592ce2b9e3855 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 867c69d1443b44311ab35f58304b304750c38066
Merge: f0e917d 7a4bee5
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed May 17 13:50:03 2017 -0400

    Merge branch '11714-crunch-run-cgroup-parent' closes #11714


commit 7a4bee5299767c8491bdfe7efaa8a936f2c2bf6a
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
--