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

Fix start display : do not mix logs with progress

Browse Source 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
Guillaume Tardif 2021-01-29 12:23:19 +01:00
parent c9028f9f37
commit 7f3db85b11
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cli/cmd/compose/start.go
View File

@ -24,7 +24,6 @@ import (
"github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/api/progress"
"github.com/docker/compose-cli/cli/formatter" "github.com/docker/compose-cli/cli/formatter"
) )
@ -59,17 +58,16 @@ func runStart(ctx context.Context, opts startOptions, services []string) error {
if !opts.Detach { if !opts.Detach {
consumer = formatter.NewLogConsumer(ctx, os.Stdout) consumer = formatter.NewLogConsumer(ctx, os.Stdout)
} }
_, err = progress.Run(ctx, func(ctx context.Context) (string, error) {
project, err := opts.toProject()
if err != nil {
return "", err
}
err = filter(project, services) project, err := opts.toProject()
if err != nil { if err != nil {
return "", err return err
} }
return "", c.ComposeService().Start(ctx, project, consumer)
}) err = filter(project, services)
return err if err != nil {
return err
}
return c.ComposeService().Start(ctx, project, consumer)
} }