Merge pull request #320 from joshwget/stopped-container-refactoring

Move stopped container handling to cli/app package

Author: vdemeester

cli/app/app.go

@@ -234,18 +234,22 @@ func ProjectDelete(p project.APIProject, c *cli.Context) error {
 		RemoveVolume: c.Bool("v"),
 	}
 	if !c.Bool("force") {
-		options.BeforeDeleteCallback = func(stoppedContainers []string) bool {
-			fmt.Printf("Going to remove %v\nAre you sure? [yN]\n", strings.Join(stoppedContainers, ", "))
-			var answer string
-			_, err := fmt.Scanln(&answer)
-			if err != nil {
-				logrus.Error(err)
-				return false
-			}
-			if answer != "y" && answer != "Y" {
-				return false
-			}
-			return true
+		stoppedContainers, err := p.ListStoppedContainers(context.Background(), c.Args()...)
+		if err != nil {
+			return cli.NewExitError(err.Error(), 1)
+		}
+		if len(stoppedContainers) == 0 {
+			fmt.Println("No stopped containers")
+			return nil
+		}
+		fmt.Printf("Going to remove %v\nAre you sure? [yN]\n", strings.Join(stoppedContainers, ", "))
+		var answer string
+		_, err = fmt.Scanln(&answer)
+		if err != nil {
+			return cli.NewExitError(err.Error(), 1)
+		}
+		if answer != "y" && answer != "Y" {
+			return nil
 		}
 	}
 	err := p.Delete(context.Background(), options, c.Args()...)

docker/service.go

@@ -556,7 +556,7 @@ func (s *Service) Kill(ctx context.Context, signal string) error {
 func (s *Service) Delete(ctx context.Context, options options.Delete) error {
 	return s.collectContainersAndDo(ctx, func(c *Container) error {
 		running, _ := c.IsRunning(ctx)
-		if !running {
+		if !running || options.RemoveRunning {
 			return c.Remove(ctx, options.RemoveVolume)
 		}
 		return nil

project/interface.go

@@ -37,6 +37,7 @@ type APIProject interface {
 	CreateService(name string) (Service, error)
 	AddConfig(name string, config *config.ServiceConfig) error
 	Load(bytes []byte) error
+	ListStoppedContainers(ctx context.Context, services ...string) ([]string, error)
 }
 
 // RuntimeProject defines runtime-specific methods for a libcompose implementation.

project/options/types.go

@@ -9,8 +9,8 @@ type Build struct {
 
 // Delete holds options of compose rm.
 type Delete struct {
-	RemoveVolume         bool
-	BeforeDeleteCallback func([]string) bool
+	RemoveVolume  bool
+	RemoveRunning bool
 }
 
 // Down holds options of compose down.

project/project.go

@@ -496,8 +496,8 @@ func (p *Project) Pull(ctx context.Context, services ...string) error {
 	}), nil)
 }
 
-// listStoppedContainers lists the stopped containers for the specified services.
-func (p *Project) listStoppedContainers(ctx context.Context, services ...string) ([]string, error) {
+// ListStoppedContainers lists the stopped containers for the specified services.
+func (p *Project) ListStoppedContainers(ctx context.Context, services ...string) ([]string, error) {
 	stoppedContainers := []string{}
 	err := p.forEach(services, wrapperAction(func(wrapper *serviceWrapper, wrappers map[string]*serviceWrapper) {
 		wrapper.Do(nil, events.NoEvent, events.NoEvent, func(service Service) error {
@@ -531,18 +531,6 @@ func (p *Project) listStoppedContainers(ctx context.Context, services ...string)
 
 // Delete removes the specified services (like docker rm).
 func (p *Project) Delete(ctx context.Context, options options.Delete, services ...string) error {
-	stoppedContainers, err := p.listStoppedContainers(ctx, services...)
-	if err != nil {
-		return err
-	}
-	if len(stoppedContainers) == 0 {
-		p.Notify(events.ProjectDeleteDone, "", nil)
-		fmt.Println("No stopped containers")
-		return nil
-	}
-	if options.BeforeDeleteCallback != nil && !options.BeforeDeleteCallback(stoppedContainers) {
-		return nil
-	}
 	return p.perform(events.ProjectDeleteStart, events.ProjectDeleteDone, services, wrapperAction(func(wrapper *serviceWrapper, wrappers map[string]*serviceWrapper) {
 		wrapper.Do(nil, events.ServiceDeleteStart, events.ServiceDelete, func(service Service) error {
 			return service.Delete(ctx, options)