From d6703f161c75a780ff645dc1ec980fca8a3e315b Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 30 Mar 2017 14:19:42 -0400 Subject: [PATCH] 9132: Fix after rebase --- services/crunch-run/crunchrun.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go index 40d6ffd8d8..64e79a68eb 100644 --- a/services/crunch-run/crunchrun.go +++ b/services/crunch-run/crunchrun.go @@ -716,8 +716,7 @@ func (runner *ContainerRunner) CreateContainer() error { runner.ContainerConfig.Env = append(runner.ContainerConfig.Env, k+"="+v) } - runner.ContainerID = createdBody.ID - runner.HostConfig = dockerclient.HostConfig{ + runner.HostConfig = dockercontainer.HostConfig{ Binds: runner.Binds, Cgroup: dockercontainer.CgroupSpec(runner.setCgroupParent), LogConfig: dockercontainer.LogConfig{ @@ -735,12 +734,12 @@ func (runner *ContainerRunner) CreateContainer() error { "ARVADOS_API_HOST="+os.Getenv("ARVADOS_API_HOST"), "ARVADOS_API_HOST_INSECURE="+os.Getenv("ARVADOS_API_HOST_INSECURE"), ) - runner.HostConfig.NetworkMode = runner.networkMode + runner.HostConfig.NetworkMode = dockercontainer.NetworkMode(runner.networkMode) } else { if runner.enableNetwork == "always" { - runner.HostConfig.NetworkMode = runner.networkMode + runner.HostConfig.NetworkMode = dockercontainer.NetworkMode(runner.networkMode) } else { - runner.HostConfig.NetworkMode = "none" + runner.HostConfig.NetworkMode = dockercontainer.NetworkMode("none") } } @@ -749,6 +748,8 @@ func (runner *ContainerRunner) CreateContainer() error { return fmt.Errorf("While creating container: %v", err) } + runner.ContainerID = createdBody.ID + return runner.AttachStreams() } -- 2.30.2