From 44b4bc01afabd1996d32b0cba61c321b17167401 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Wed, 2 Dec 2020 11:12:22 +0100 Subject: [PATCH] =?UTF-8?q?In=20`compose=20down`=20progress=20display:=20p?= =?UTF-8?q?refix=20container=20names=20with=20=E2=80=9CContainer=E2=80=9D,?= =?UTF-8?q?=20same=20as=20Services,=20Networks,=20homogeneous=20with=20`co?= =?UTF-8?q?mpose=20up`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guillaume Tardif --- local/compose.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/local/compose.go b/local/compose.go index ef6d96f20..1434f3f2d 100644 --- a/local/compose.go +++ b/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 _, c := range containers { eg.Go(func() error { - cName := getContainerName(c) - w.Event(progress.StoppingEvent(cName)) + eventName := "Container " + getContainerName(c) + w.Event(progress.StoppingEvent(eventName)) err := s.apiClient.ContainerStop(ctx, c.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)) + w.Event(progress.RemovingEvent(eventName)) err = s.apiClient.ContainerRemove(ctx, c.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 }) }