summaryrefslogtreecommitdiff
path: root/pkg/adapter/containers.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-11-01 14:34:40 +0100
committerGitHub <noreply@github.com>2019-11-01 14:34:40 +0100
commit69165fa04d9db306809a0b110491f9a572f74431 (patch)
tree4399ffe534b5dbbb4a0963ba07a60f15c2d2eb73 /pkg/adapter/containers.go
parent9a28a12c9bc6f681558f7aa6f797765262fab81b (diff)
parent1df4dba0a0c335ad68b1c2202b8099cd87aa3d94 (diff)
downloadpodman-69165fa04d9db306809a0b110491f9a572f74431.tar.gz
podman-69165fa04d9db306809a0b110491f9a572f74431.tar.bz2
podman-69165fa04d9db306809a0b110491f9a572f74431.zip
Merge pull request #4400 from haircommander/exec-hang
Switch to bufio Reader for exec streams
Diffstat (limited to 'pkg/adapter/containers.go')
-rw-r--r--pkg/adapter/containers.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go
index ea5c54814..64550f545 100644
--- a/pkg/adapter/containers.go
+++ b/pkg/adapter/containers.go
@@ -900,7 +900,7 @@ func (r *LocalRuntime) execPS(c *libpod.Container, args []string) ([]string, err
streams := new(libpod.AttachStreams)
streams.OutputStream = wPipe
streams.ErrorStream = wPipe
- streams.InputStream = os.Stdin
+ streams.InputStream = bufio.NewReader(os.Stdin)
streams.AttachOutput = true
streams.AttachError = true
streams.AttachInput = true
@@ -978,7 +978,7 @@ func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecVal
streams.OutputStream = os.Stdout
streams.ErrorStream = os.Stderr
if cli.Interactive {
- streams.InputStream = os.Stdin
+ streams.InputStream = bufio.NewReader(os.Stdin)
streams.AttachInput = true
}
streams.AttachOutput = true