Merge pull request #1000 from gtardif/compose_down_display

In `compose down` progress display: prefix container names with “Container”,

local/compose.go

@@ -261,28 +261,28 @@ func (s *composeService) Down(ctx context.Context, projectName string) error {
 }
 
 func (s *composeService) removeContainers(ctx context.Context, w progress.Writer, eg *errgroup.Group, filter filters.Args) error {
-	cnts, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{
+	containers, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{
 		Filters: filter,
 	})
 	if err != nil {
 		return err
 	}
-	for _, c := range cnts {
+	for _, container := range containers {
 		eg.Go(func() error {
-			cName := getContainerName(c)
-			w.Event(progress.StoppingEvent(cName))
-			err := s.apiClient.ContainerStop(ctx, c.ID, nil)
+			eventName := "Container " + getContainerName(container)
+			w.Event(progress.StoppingEvent(eventName))
+			err := s.apiClient.ContainerStop(ctx, container.ID, nil)
 			if err != nil {
-				w.Event(progress.ErrorMessageEvent(cName, "Error while Stopping"))
+				w.Event(progress.ErrorMessageEvent(eventName, "Error while Stopping"))
 				return err
 			}
-			w.Event(progress.RemovingEvent(cName))
-			err = s.apiClient.ContainerRemove(ctx, c.ID, moby.ContainerRemoveOptions{})
+			w.Event(progress.RemovingEvent(eventName))
+			err = s.apiClient.ContainerRemove(ctx, container.ID, moby.ContainerRemoveOptions{})
 			if err != nil {
-				w.Event(progress.ErrorMessageEvent(cName, "Error while Removing"))
+				w.Event(progress.ErrorMessageEvent(eventName, "Error while Removing"))
 				return err
 			}
-			w.Event(progress.RemovedEvent(cName))
+			w.Event(progress.RemovedEvent(eventName))
 			return nil
 		})
 	}
@@ -290,7 +290,7 @@ func (s *composeService) removeContainers(ctx context.Context, w progress.Writer
 }
 
 func (s *composeService) projectFromContainerLabels(ctx context.Context, projectName string) (*types.Project, error) {
-	cnts, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{
+	containers, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{
 		Filters: filters.NewArgs(
 			projectFilter(projectName),
 		),
@@ -298,10 +298,10 @@ func (s *composeService) projectFromContainerLabels(ctx context.Context, project
 	if err != nil {
 		return nil, err
 	}
-	if len(cnts) == 0 {
+	if len(containers) == 0 {
 		return nil, nil
 	}
-	options, err := loadProjectOptionsFromLabels(cnts[0])
+	options, err := loadProjectOptionsFromLabels(containers[0])
 	if err != nil {
 		return nil, err
 	}
@@ -309,9 +309,9 @@ func (s *composeService) projectFromContainerLabels(ctx context.Context, project
 		fakeProject := &types.Project{
 			Name: projectName,
 		}
-		for _, c := range cnts {
+		for _, container := range containers {
 			fakeProject.Services = append(fakeProject.Services, types.ServiceConfig{
-				Name: c.Labels[serviceLabel],
+				Name: container.Labels[serviceLabel],
 			})
 		}
 		return fakeProject, nil