tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docker-compose parity: start implies `--detach` (otherwise, use `up`) 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-02-12 10:08:46 +01:00
parent 8533a26929
commit 49415afe5d
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,17 +18,14 @@ package compose
import ( import (
"context" "context"
"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/api/progress"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
type startOptions struct { type startOptions struct {
*projectOptions *projectOptions
Detach bool
} }
func startCommand(p *projectOptions) *cobra.Command { func startCommand(p *projectOptions) *cobra.Command {
@ -42,8 +39,6 @@ func startCommand(p *projectOptions) *cobra.Command {
return runStart(cmd.Context(), opts, args) return runStart(cmd.Context(), opts, args)
}, },
} }
startCmd.Flags().BoolVarP(&opts.Detach, "detach", "d", false, "Detached mode: Run containers in the background")
return startCmd return startCmd
} }
@ -58,32 +53,8 @@ func runStart(ctx context.Context, opts startOptions, services []string) error {
return err return err
} }
if opts.Detach {
_, err = progress.Run(ctx, func(ctx context.Context) (string, error) { _, err = progress.Run(ctx, func(ctx context.Context) (string, error) {
return "", c.ComposeService().Start(ctx, project, compose.StartOptions{}) return "", c.ComposeService().Start(ctx, project, compose.StartOptions{})
}) })
return err return err
} }
queue := make(chan compose.ContainerEvent)
printer := printer{
queue: queue,
}
err = c.ComposeService().Start(ctx, project, compose.StartOptions{
Attach: func(event compose.ContainerEvent) {
queue <- event
},
})
if err != nil {
return err
}
_, err = printer.run(ctx, false, "", nil, func() error {
ctx := context.Background()
_, err := progress.Run(ctx, func(ctx context.Context) (string, error) {
return "", c.ComposeService().Stop(ctx, project)
})
return err
})
return err
}