Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit c663ea6

Browse files
authored
Merge pull request #1260 from gtardif/down_warn_nothing_to_remove
Down warning when nothing to remove
2 parents ec26ba5 + ec302a2 commit c663ea6

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

api/progress/tty.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ func (w *ttyWriter) Event(e Event) {
8484
} else {
8585
e.startTime = time.Now()
8686
e.spinner = newSpinner()
87+
if e.Status == Done || e.Status == Error {
88+
e.stop()
89+
}
8790
w.events[e.ID] = e
8891
}
8992
}

local/compose/down.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434

3535
func (s *composeService) Down(ctx context.Context, projectName string, options compose.DownOptions) error {
3636
w := progress.ContextWriter(ctx)
37+
resourceToRemove := false
3738

3839
if options.Project == nil {
3940
project, err := s.projectFromContainerLabels(ctx, projectName)
@@ -51,6 +52,9 @@ func (s *composeService) Down(ctx context.Context, projectName string, options c
5152
if err != nil {
5253
return err
5354
}
55+
if len(containers) > 0 {
56+
resourceToRemove = true
57+
}
5458

5559
err = InReverseDependencyOrder(ctx, options.Project, func(c context.Context, service types.ServiceConfig) error {
5660
serviceContainers, others := containers.split(isService(service.Name))
@@ -80,12 +84,16 @@ func (s *composeService) Down(ctx context.Context, projectName string, options c
8084

8185
eg, _ := errgroup.WithContext(ctx)
8286
for _, n := range networks {
87+
resourceToRemove = true
8388
networkID := n.ID
8489
networkName := n.Name
8590
eg.Go(func() error {
8691
return s.ensureNetworkDown(ctx, networkID, networkName)
8792
})
8893
}
94+
if !resourceToRemove {
95+
w.Event(progress.NewEvent(projectName, progress.Done, "Warning: No resource found to remove"))
96+
}
8997
return eg.Wait()
9098
}
9199

0 commit comments

Comments
 (0)