only use stdin if specified
@@ -1057,12 +1057,8 @@ func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecVal
ecChan := make(chan int, 1)
errChan := configureVarlinkAttachStdio(r.Conn.Reader, r.Conn.Writer, inputStream, os.Stdout, oldTermState, resize, ecChan)
- select {
- case ec = <-ecChan:
- break
- case err = <-errChan:
- break
- }
+ ec = <-ecChan
+ err = <-errChan
return ec, err
}
@@ -1095,6 +1091,7 @@ func configureVarlinkAttachStdio(reader *bufio.Reader, writer *bufio.Writer, std
}
}()
+ if stdin != nil {
// Takes stdinput and sends it over the wire after being encoded
go func() {
if _, err := io.Copy(varlinkStdinWriter, stdin); err != nil {
@@ -1103,5 +1100,6 @@ func configureVarlinkAttachStdio(reader *bufio.Reader, writer *bufio.Writer, std
}
}()
+ }
return errChan
}
