From c7afc6188b58864836511e358d2a538f31ea5f7b Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Wed, 24 May 2023 16:26:24 +0200 Subject: [PATCH] detect conflict removing volume/image and warn user Signed-off-by: Nicolas De Loof --- pkg/compose/down.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/compose/down.go b/pkg/compose/down.go index 34f3df488..23ea4e43e 100644 --- a/pkg/compose/down.go +++ b/pkg/compose/down.go @@ -252,6 +252,10 @@ func (s *composeService) removeImage(ctx context.Context, image string, w progre w.Event(progress.NewEvent(id, progress.Done, "Removed")) return nil } + if errdefs.IsConflict(err) { + w.Event(progress.NewEvent(id, progress.Warning, "Resource is still in use")) + return nil + } if errdefs.IsNotFound(err) { w.Event(progress.NewEvent(id, progress.Done, "Warning: No resource found to remove")) return nil @@ -267,6 +271,10 @@ func (s *composeService) removeVolume(ctx context.Context, id string, w progress w.Event(progress.NewEvent(resource, progress.Done, "Removed")) return nil } + if errdefs.IsConflict(err) { + w.Event(progress.NewEvent(resource, progress.Warning, "Resource is still in use")) + return nil + } if errdefs.IsNotFound(err) { w.Event(progress.NewEvent(resource, progress.Done, "Warning: No resource found to remove")) return nil