Update go-runc to f36917a18b3d962aee066063cba0bcff44e338ca

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-01-25 11:52:05 -08:00
parent d619954a2b
commit 462bdd7669
3 changed files with 64 additions and 4 deletions

View file

@ -102,7 +102,24 @@ func (r *Runc) Create(context context.Context, id, bundle string, opts *CreateOp
if opts != nil {
opts.Set(cmd)
}
return runOrError(cmd)
if cmd.Stdout == nil && cmd.Stderr == nil {
data, err := cmd.CombinedOutput()
if err != nil {
return fmt.Errorf("%s: %s", err, data)
}
return nil
}
if err := cmd.Start(); err != nil {
return err
}
if opts != nil && opts.IO != nil {
if c, ok := opts.IO.(StartCloser); ok {
if err := c.CloseAfterStart(); err != nil {
return err
}
}
}
return cmd.Wait()
}
// Start will start an already created container