fix docker rmi stucking

Signed-off-by: Haichao Yang <yang.haichao@zte.com.cn>
thaJeztah · Aug 19, 2019 · d3f6484 · d3f6484
1 parent 0c46a20
commit d3f6484
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/daemon/images/image_delete.go b/daemon/images/image_delete.go
@@ -369,7 +369,7 @@ func (i *ImageService) checkImageDeleteConflict(imgID image.ID, mask conflictTyp
  if mask&conflictRunningContainer != 0 {
  // Check if any running container is using the image.
  running := func(c *container.Container) bool {
- return c.IsRunning() && c.ImageID == imgID
+ return c.ImageID == imgID && c.IsRunning()
  }
  if container := i.containers.First(running); container != nil {
  return &imageDeleteConflict{