diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-01 14:34:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-01 14:34:40 +0100 |
| commit | 69165fa04d9db306809a0b110491f9a572f74431 (patch) | |
| tree | 4399ffe534b5dbbb4a0963ba07a60f15c2d2eb73 /libpod/container_api.go | |
| parent | 9a28a12c9bc6f681558f7aa6f797765262fab81b (diff) | |
| parent | 1df4dba0a0c335ad68b1c2202b8099cd87aa3d94 (diff) | |
| download | podman-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 'libpod/container_api.go')
| -rw-r--r-- | libpod/container_api.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index 1b2d52ce3..a6f5b54d5 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -1,6 +1,7 @@ package libpod import ( + "bufio" "context" "io" "io/ioutil" @@ -361,7 +362,7 @@ type AttachStreams struct { // ErrorStream will be attached to container's STDERR ErrorStream io.WriteCloser // InputStream will be attached to container's STDIN - InputStream io.Reader + InputStream *bufio.Reader // AttachOutput is whether to attach to STDOUT // If false, stdout will not be attached AttachOutput bool |