Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 2e01d90774 into 9861ce90fd

This commit is contained in:
Seongbin Hong 2024-11-18 20:04:48 +02:00 committed by GitHub
parent 9861ce90fd 2e01d90774
commit dc89222fcc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cli/command/container/hijack.go
View File

@ -48,6 +48,13 @@ func (h *hijackedIOStreamer) stream(ctx context.Context) error {
outputDone := h.beginOutputStream(restoreInput)
inputDone, detached := h.beginInputStream(restoreInput)
defer func() {
// Close the pipe after the outputStream had done.
if err := h.resp.CloseWrite(); err != nil {
logrus.Debugf("Couldn't send EOF: %s", err)
}
}()
select {
case err := <-outputDone:
return err
@ -167,11 +174,6 @@ func (h *hijackedIOStreamer) beginInputStream(restoreInput func()) (doneC <-chan
logrus.Debugf("Error sendStdin: %s", err)
}
}
if err := h.resp.CloseWrite(); err != nil {
logrus.Debugf("Couldn't send EOF: %s", err)
}
close(inputDone)
}()