Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-27 03:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

introduce cascade stop "--abort-on-container-exit" option

Browse source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-02-08 11:42:42 +01:00
parent 7a7114fb5f
commit f3d093cb54
8 changed files with 56 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/cmd/compose/start.go
View file

@ -18,12 +18,12 @@ package compose
import (
"context"
"github.com/docker/compose-cli/api/compose"
"os"
"github.com/spf13/cobra"
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/api/progress"
"github.com/docker/compose-cli/cli/formatter"
)

23
cli/cmd/compose/up.go
View file

@ -49,6 +49,7 @@ type upOptions struct {
forceRecreate bool
noRecreate bool
noStart bool
cascadeStop bool
}
func (o upOptions) recreateStrategy() string {
@ -73,6 +74,9 @@ func upCommand(p *projectOptions, contextType string) *cobra.Command {
RunE: func(cmd *cobra.Command, args []string) error {
switch contextType {
case store.LocalContextType, store.DefaultContextType, store.EcsLocalSimulationContextType:
if opts.cascadeStop && opts.Detach {
return fmt.Errorf("--abort-on-container-exit and --detach are incompatible")
}
if opts.forceRecreate && opts.noRecreate {
return fmt.Errorf("--force-recreate and --no-recreate are incompatible")
}
@ -95,6 +99,7 @@ func upCommand(p *projectOptions, contextType string) *cobra.Command {
flags.BoolVar(&opts.forceRecreate, "force-recreate", false, "Recreate containers even if their configuration and image haven't changed.")
flags.BoolVar(&opts.noRecreate, "no-recreate", false, "If containers already exist, don't recreate them. Incompatible with --force-recreate.")
flags.BoolVar(&opts.noStart, "no-start", false, "Don't start the services after creating them.")
flags.BoolVar(&opts.cascadeStop, "abort-on-container-exit", false, "Stops all containers if any container was stopped. Incompatible with -d")
}
return upCmd
@ -145,9 +150,25 @@ func runCreateStart(ctx context.Context, opts upOptions, services []string) erro
return nil
}
ctx, cancel := context.WithCancel(ctx)
listener := make(chan compose.Event)
go func() {
var aborting bool
for {
<-listener
if opts.cascadeStop && !aborting {
aborting = true
fmt.Println("Aborting on container exit...")
cancel()
}
}
}()
err = c.ComposeService().Start(ctx, project, compose.StartOptions{
Attach: formatter.NewLogConsumer(ctx, os.Stdout),
Attach: formatter.NewLogConsumer(ctx, os.Stdout),
Listener: listener,
})
if errors.Is(ctx.Err(), context.Canceled) {
fmt.Println("Gracefully stopping...")
ctx = context.Background()

7
cli/formatter/logs.go
View file

@ -51,9 +51,10 @@ func (l *logConsumer) Log(service, container, message string) {
}
}
func (l *logConsumer) Exit(service, container string, exitCode int) {
msg := fmt.Sprintf("%s exited with code %d\n", container, exitCode)
l.writer.Write([]byte(l.getColorFunc(service)(msg)))
func (l *logConsumer) Status(service, container, msg string) {
cf := l.getColorFunc(service)
buf := bytes.NewBufferString(fmt.Sprintf("%s %s \n", cf(container), cf(msg)))
l.writer.Write(buf.Bytes()) // nolint:errcheck
}
func (l *logConsumer) getColorFunc(service string) colorFunc {