Skip to content

Commit abc9081

Browse files
committed
detect conflict removing volume/image and warn user
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent dc6281f commit abc9081

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

pkg/compose/down.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,10 @@ func (s *composeService) removeImage(ctx context.Context, image string, w progre
252252
w.Event(progress.NewEvent(id, progress.Done, "Removed"))
253253
return nil
254254
}
255+
if errdefs.IsConflict(err) {
256+
w.Event(progress.NewEvent(id, progress.Warning, "Resource is still in use"))
257+
return nil
258+
}
255259
if errdefs.IsNotFound(err) {
256260
w.Event(progress.NewEvent(id, progress.Done, "Warning: No resource found to remove"))
257261
return nil
@@ -267,6 +271,10 @@ func (s *composeService) removeVolume(ctx context.Context, id string, w progress
267271
w.Event(progress.NewEvent(resource, progress.Done, "Removed"))
268272
return nil
269273
}
274+
if errdefs.IsConflict(err) {
275+
w.Event(progress.NewEvent(resource, progress.Warning, "Resource is still in use"))
276+
return nil
277+
}
270278
if errdefs.IsNotFound(err) {
271279
w.Event(progress.NewEvent(resource, progress.Done, "Warning: No resource found to remove"))
272280
return nil

0 commit comments

Comments
 (0)