tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

close container stream on os.stdin EOF

Browse Source 
close https://github.com/docker/compose-cli/issues/1944

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-07-23 14:52:31 +02:00
parent c257001e5a
commit 0b72b502d3
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
2 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/compose/exec.go
View File

@ -118,13 +118,13 @@ func (s *composeService) interactiveExec(ctx context.Context, opts api.RunOption
_, err := stdcopy.StdCopy(opts.Stdout, opts.Stderr, stdout)
outputDone <- err
}
defer stdout.Close() //nolint:errcheck
stdout.Close() //nolint:errcheck
}()
go func() {
_, err := io.Copy(stdin, r)
inputDone <- err
defer stdin.Close() //nolint:errcheck
stdin.Close() //nolint:errcheck
}()
for {

55
pkg/compose/run.go
View File

@ -26,7 +26,6 @@ import (
"github.com/compose-spec/compose-go/types"
"github.com/docker/cli/cli/streams"
moby "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/stdcopy"
"github.com/docker/docker/pkg/stringid"
@ -62,10 +61,6 @@ func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.
if err != nil {
return 0, err
}
defer stdin.Close() //nolint:errcheck
defer stdout.Close() //nolint:errcheck
detached := make(chan bool)
in := streams.NewIn(opts.Stdin)
if in.IsTerminal() {
@ -76,19 +71,24 @@ func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.
defer term.RestoreTerminal(in.FD(), state) //nolint:errcheck
}
outputDone := make(chan error)
inputDone := make(chan error)
go func() {
if opts.Tty {
io.Copy(opts.Stdout, stdout) //nolint:errcheck
_, err := io.Copy(opts.Stdout, stdout) //nolint:errcheck
outputDone <- err
} else {
stdcopy.StdCopy(opts.Stdout, opts.Stderr, stdout) //nolint:errcheck
_, err := stdcopy.StdCopy(opts.Stdout, opts.Stderr, stdout) //nolint:errcheck
outputDone <- err
}
stdout.Close() //nolint:errcheck
}()
go func() {
_, err := io.Copy(stdin, r)
if _, ok := err.(term.EscapeError); ok {
detached <- true
}
inputDone <- err
stdin.Close() //nolint:errcheck
}()
err = s.apiClient.ContainerStart(ctx, containerID, moby.ContainerStartOptions{})
@ -98,16 +98,33 @@ func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.
s.monitorTTySize(ctx, containerID, s.apiClient.ContainerResize)
statusC, errC := s.apiClient.ContainerWait(ctx, containerID, container.WaitConditionNextExit)
select {
case status := <-statusC:
return int(status.StatusCode), nil
case err := <-errC:
return 0, err
case <-detached:
return 0, err
for {
select {
case err := <-outputDone:
if err != nil {
return 0, err
}
inspect, err := s.apiClient.ContainerInspect(ctx, containerID)
if err != nil {
return 0, err
}
exitCode := 0
if inspect.State != nil {
exitCode = inspect.State.ExitCode
}
return exitCode, nil
case err := <-inputDone:
if _, ok := err.(term.EscapeError); ok {
return 0, nil
}
if err != nil {
return 0, err
}
// Wait for output to complete streaming
case <-ctx.Done():
return 0, ctx.Err()
}
}
}
func (s *composeService) prepareRun(ctx context.Context, project *types.Project, observedState Containers, opts api.RunOptions) (string, error) {