浏览代码

Merge pull request #33409 from alfred-landrum/image-prune-panic

prevent image prune panic
Akihiro Suda 8 年之前
父节点
当前提交
bde4c89351
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      daemon/prune.go

+ 1 - 1
daemon/prune.go

@@ -216,7 +216,7 @@ func (daemon *Daemon) ImagesPrune(ctx context.Context, pruneFilters filters.Args
 			if !until.IsZero() && img.Created.After(until) {
 			if !until.IsZero() && img.Created.After(until) {
 				continue
 				continue
 			}
 			}
-			if !matchLabels(pruneFilters, img.Config.Labels) {
+			if img.Config != nil && !matchLabels(pruneFilters, img.Config.Labels) {
 				continue
 				continue
 			}
 			}
 			topImages[id] = img
 			topImages[id] = img