Merge pull request #335 from thaJeztah/19.03_backport_dev190815

andrewhsu · web-flow · commit 56b48a3b3f1c · 2019-09-23T09:30:56.000-07:00
[19.03 backport] fix docker rmi stucking
Upstream-commit: 09b72e0be471b066f62d5d2b51ba2900df85805b
Component: engine
diff --git a/components/engine/daemon/images/image_delete.go b/components/engine/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{

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ func (i *ImageService) checkImageDeleteConflict(imgID image.ID, mask conflictTyp`
`369`	`369`	`if mask&conflictRunningContainer != 0 {`
`370`	`370`	`// Check if any running container is using the image.`
`371`	`371`	`running := func(c *container.Container) bool {`
`372`		`- return c.IsRunning() && c.ImageID == imgID`
	`372`	`+ return c.ImageID == imgID && c.IsRunning()`
`373`	`373`	`}`
`374`	`374`	`if container := i.containers.First(running); container != nil {`
`375`	`375`	`return &imageDeleteConflict{`