set terminal in character mode when attached to a container

ndeloof · ndeloof · commit d4a8e92f462f · 2021-03-24T15:37:32.000+01:00
Signed-off-by: Nicolas De Loof &lt;nicolas.deloof@gmail.com&gt;
diff --git a/api/compose/api.go b/api/compose/api.go
@@ -181,8 +181,8 @@ type RunOptions struct {
 	Entrypoint        []string
 	Detach            bool
 	AutoRemove        bool
-	Writer            io.Writer
-	Reader            io.Reader
+	Writer            io.WriteCloser
+	Reader            io.ReadCloser
 	Tty               bool
 	WorkingDir        string
 	User              string
diff --git a/local/compose/attach.go b/local/compose/attach.go
@@ -27,6 +27,7 @@ import (
 	"github.com/docker/compose-cli/utils"
 
 	"github.com/compose-spec/compose-go/types"
+	"github.com/docker/cli/cli/streams"
 	moby "github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stdcopy"
 )
@@ -108,26 +109,40 @@ func (s *composeService) attachContainer(ctx context.Context, container moby.Con
 		Service:   container.Labels[serviceLabel],
 	})
 
-	return s.attachContainerStreams(ctx, container.ID, service.Tty, nil, w)
+	_, err = s.attachContainerStreams(ctx, container.ID, service.Tty, nil, w)
+	return err
 }
 
-func (s *composeService) attachContainerStreams(ctx context.Context, container string, tty bool, r io.Reader, w io.Writer) error {
+func (s *composeService) attachContainerStreams(ctx context.Context, container string, tty bool, r io.ReadCloser, w io.Writer) (func(), error) {
+	var (
+		in      *streams.In
+		restore = func() { /* noop */ }
+	)
+	if r != nil {
+		in = streams.NewIn(r)
+		restore = in.RestoreTerminal
+	}
+
 	stdin, stdout, err := s.getContainerStreams(ctx, container)
 	if err != nil {
-		return err
+		return restore, err
 	}
 
 	go func() {
 		<-ctx.Done()
-		stdout.Close() //nolint:errcheck
-		if stdin != nil {
-			stdin.Close() //nolint:errcheck
+		if in != nil {
+			in.Close() //nolint:errcheck
 		}
+		stdout.Close() //nolint:errcheck
 	}()
 
-	if r != nil && stdin != nil {
+	if in != nil && stdin != nil {
+		err := in.SetRawTerminal()
+		if err != nil {
+			return restore, err
+		}
 		go func() {
-			io.Copy(stdin, r) //nolint:errcheck
+			io.Copy(stdin, in) //nolint:errcheck
 		}()
 	}
 
@@ -140,7 +155,7 @@ func (s *composeService) attachContainerStreams(ctx context.Context, container s
 			}
 		}()
 	}
-	return nil
+	return restore, nil
 }
 
 func (s *composeService) getContainerStreams(ctx context.Context, container string) (io.WriteCloser, io.ReadCloser, error) {
diff --git a/local/compose/create.go b/local/compose/create.go
@@ -247,7 +247,7 @@ func (s *composeService) getCreateOptions(ctx context.Context, p *types.Project,
 		ExposedPorts:    buildContainerPorts(service),
 		Tty:             tty,
 		OpenStdin:       stdinOpen,
-		StdinOnce:       true,
+		StdinOnce:       attachStdin && stdinOpen,
 		AttachStdin:     attachStdin,
 		AttachStderr:    true,
 		AttachStdout:    true,
diff --git a/local/compose/run.go b/local/compose/run.go
@@ -86,10 +86,11 @@ func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.
 		return 0, err
 	}
 	oneoffContainer := containers[0]
-	err = s.attachContainerStreams(ctx, oneoffContainer.ID, service.Tty, opts.Reader, opts.Writer)
+	restore, err := s.attachContainerStreams(ctx, oneoffContainer.ID, service.Tty, opts.Reader, opts.Writer)
 	if err != nil {
 		return 0, err
 	}
+	defer restore()
 
 	err = s.apiClient.ContainerStart(ctx, containerID, apitypes.ContainerStartOptions{})
 	if err != nil {
diff --git a/utils/logs.go b/utils/logs.go
@@ -62,7 +62,7 @@ func (a *allowListLogConsumer) Register(name string) {
 }
 
 // GetWriter creates a io.Writer that will actually split by line and format by LogConsumer
-func GetWriter(container, service string, events compose.ContainerEventListener) io.Writer {
+func GetWriter(container, service string, events compose.ContainerEventListener) io.WriteCloser {
 	return &splitBuffer{
 		buffer:    bytes.Buffer{},
 		service:   service,
@@ -100,3 +100,17 @@ func (s *splitBuffer) Write(b []byte) (int, error) {
 	}
 	return n, nil
 }
+
+func (s *splitBuffer) Close() error {
+	b := s.buffer.Bytes()
+	if len(b) == 0 {
+		return nil
+	}
+	s.consumer(compose.ContainerEvent{
+		Type:      compose.ContainerEventLog,
+		Service:   s.service,
+		Container: s.container,
+		Line:      string(b),
+	})
+	return nil
+}

Original file line number	Diff line number	Diff line change
`@@ -86,10 +86,11 @@ func (s composeService) RunOneOffContainer(ctx context.Context, project types.`
`86`	`86`	`return 0, err`
`87`	`87`	`}`
`88`	`88`	`oneoffContainer := containers[0]`
`89`		`- err = s.attachContainerStreams(ctx, oneoffContainer.ID, service.Tty, opts.Reader, opts.Writer)`
	`89`	`+ restore, err := s.attachContainerStreams(ctx, oneoffContainer.ID, service.Tty, opts.Reader, opts.Writer)`
`90`	`90`	`if err != nil {`
`91`	`91`	`return 0, err`
`92`	`92`	`}`
	`93`	`+ defer restore()`
`93`	`94`
`94`	`95`	`err = s.apiClient.ContainerStart(ctx, containerID, apitypes.ContainerStartOptions{})`
`95`	`96`	`if err != nil {`