From 58e10a7af2b2a84b3b7a4eaba0d92f5543f068b8 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Mon, 8 Feb 2021 17:20:36 +0100 Subject: [PATCH 1/2] Display warning in `docker compose down` if nothing to remove (no container, no network) For reference, `docker-compose` displays `WARNING: Network sentences_default not found` Signed-off-by: Guillaume Tardif --- local/compose/down.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/local/compose/down.go b/local/compose/down.go index e769653e..0bd583ce 100644 --- a/local/compose/down.go +++ b/local/compose/down.go @@ -34,6 +34,7 @@ import ( func (s *composeService) Down(ctx context.Context, projectName string, options compose.DownOptions) error { w := progress.ContextWriter(ctx) + resourceToRemove := false if options.Project == nil { project, err := s.projectFromContainerLabels(ctx, projectName) @@ -51,6 +52,9 @@ func (s *composeService) Down(ctx context.Context, projectName string, options c if err != nil { return err } + if len(containers) > 0 { + resourceToRemove = true + } err = InReverseDependencyOrder(ctx, options.Project, func(c context.Context, service types.ServiceConfig) error { serviceContainers, others := containers.split(isService(service.Name)) @@ -80,12 +84,16 @@ func (s *composeService) Down(ctx context.Context, projectName string, options c eg, _ := errgroup.WithContext(ctx) for _, n := range networks { + resourceToRemove = true networkID := n.ID networkName := n.Name eg.Go(func() error { return s.ensureNetworkDown(ctx, networkID, networkName) }) } + if !resourceToRemove { + w.Event(progress.NewEvent(projectName, progress.Done, "Warning: No resource found to remove")) + } return eg.Wait() } From ec302a2e1029dae3570cb334b60d76e0be02d009 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Mon, 8 Feb 2021 17:21:18 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Fix=20display=20glitch=20when=20sending=20a?= =?UTF-8?q?=20single=20=E2=80=9CDone=E2=80=9D=20event=20with=20no=20previo?= =?UTF-8?q?us=20=E2=80=9CWorking=E2=80=9D=20event=20ont=20he=20same=20ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guillaume Tardif --- api/progress/tty.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api/progress/tty.go b/api/progress/tty.go index 5465e7e0..36999cf8 100644 --- a/api/progress/tty.go +++ b/api/progress/tty.go @@ -84,6 +84,9 @@ func (w *ttyWriter) Event(e Event) { } else { e.startTime = time.Now() e.spinner = newSpinner() + if e.Status == Done || e.Status == Error { + e.stop() + } w.events[e.ID] = e } }