mirror of
https://github.com/docker/compose.git
synced 2025-07-20 12:14:41 +02:00
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 <guillaume.tardif@gmail.com>
This commit is contained in:
parent
ec26ba5230
commit
58e10a7af2
@ -34,6 +34,7 @@ import (
|
|||||||
|
|
||||||
func (s *composeService) Down(ctx context.Context, projectName string, options compose.DownOptions) error {
|
func (s *composeService) Down(ctx context.Context, projectName string, options compose.DownOptions) error {
|
||||||
w := progress.ContextWriter(ctx)
|
w := progress.ContextWriter(ctx)
|
||||||
|
resourceToRemove := false
|
||||||
|
|
||||||
if options.Project == nil {
|
if options.Project == nil {
|
||||||
project, err := s.projectFromContainerLabels(ctx, projectName)
|
project, err := s.projectFromContainerLabels(ctx, projectName)
|
||||||
@ -51,6 +52,9 @@ func (s *composeService) Down(ctx context.Context, projectName string, options c
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if len(containers) > 0 {
|
||||||
|
resourceToRemove = true
|
||||||
|
}
|
||||||
|
|
||||||
err = InReverseDependencyOrder(ctx, options.Project, func(c context.Context, service types.ServiceConfig) error {
|
err = InReverseDependencyOrder(ctx, options.Project, func(c context.Context, service types.ServiceConfig) error {
|
||||||
serviceContainers, others := containers.split(isService(service.Name))
|
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)
|
eg, _ := errgroup.WithContext(ctx)
|
||||||
for _, n := range networks {
|
for _, n := range networks {
|
||||||
|
resourceToRemove = true
|
||||||
networkID := n.ID
|
networkID := n.ID
|
||||||
networkName := n.Name
|
networkName := n.Name
|
||||||
eg.Go(func() error {
|
eg.Go(func() error {
|
||||||
return s.ensureNetworkDown(ctx, networkID, networkName)
|
return s.ensureNetworkDown(ctx, networkID, networkName)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
if !resourceToRemove {
|
||||||
|
w.Event(progress.NewEvent(projectName, progress.Done, "Warning: No resource found to remove"))
|
||||||
|
}
|
||||||
return eg.Wait()
|
return eg.Wait()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user