tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-31 01:24:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

don't report error resizing tty, as container could stop any time

Browse Source 
see 04dad42c3c/cli/command/container/tty.go (L71) wich always return nil

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-04-14 18:54:20 +02:00
parent 597598cb7a
commit 0ab75d28ba
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
local/compose/exec.go
View File

@ -83,7 +83,7 @@ func (s *composeService) Exec(ctx context.Context, project *types.Project, opts
defer resp.Close()
if opts.Tty {
err := s.monitorTTySize(ctx, exec.ID, s.apiClient.ContainerExecResize)
s.monitorTTySize(ctx, exec.ID, s.apiClient.ContainerExecResize)
if err != nil {
return err
}

5
local/compose/resize.go
View File

@ -28,13 +28,13 @@ import (
"github.com/docker/docker/pkg/signal"
)
func (s *composeService) monitorTTySize(ctx context.Context, container string, resize func(context.Context, string, moby.ResizeOptions) error) error {
func (s *composeService) monitorTTySize(ctx context.Context, container string, resize func(context.Context, string, moby.ResizeOptions) error) {
err := resize(ctx, container, moby.ResizeOptions{ // nolint:errcheck
Height: uint(goterm.Height()),
Width: uint(goterm.Width()),
})
if err != nil {
return err
return
}
sigchan := make(chan os.Signal, 1)
@ -71,5 +71,4 @@ func (s *composeService) monitorTTySize(ctx context.Context, container string, r
}
}
}()
return nil
}

5
local/compose/run.go
View File

@ -96,10 +96,7 @@ func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.
return 0, err
}
err = s.monitorTTySize(ctx, containerID, s.apiClient.ContainerResize)
if err != nil {
return 0, err
}
s.monitorTTySize(ctx, containerID, s.apiClient.ContainerResize)
select {
case status := <-statusC: