updated with riku's code

This commit is contained in:
Steven Murr 2017-09-01 09:07:24 -07:00
parent 6bdaa811d6
commit 2d7ad48994

@ -107,12 +107,13 @@ func dockerRun(cfg *container.Config, sess ssh.Session) (status int64, cleanup f
} }
}() }()
} }
statusChan, chanErr := docker.ContainerWait(ctx, res.ID, container.WaitConditionNotRunning) resultC, errC := docker.ContainerWait(ctx, res.ID, container.WaitConditionNotRunning)
if chanErr != nil { select {
case err = <-errC:
return return
case result := <-resultC:
status = result.StatusCode
} }
err = <-chanErr err = <-outputErr
s := <-statusChan
status = s.StatusCode
return return
} }