Browse code
fix docker rmi stucking
Signed-off-by: Haichao Yang <yang.haichao@zte.com.cn>
(cherry picked from commit d3f64846a23f447f40720e647b475e665c214a01)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Haichao Yang authored on 2019/08/19 19:28:37Showing 1 changed files
| ... | ... |
@@ -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{
|