浏览代码

Merge pull request #26517 from yongtang/26493-inspect-size

Fix issue of `WARNING: --size ignored for volume` for `docker inspect`
Brian Goff 9 年之前
父节点
当前提交
04c189fa49
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      cli/command/system/inspect.go

+ 2 - 2
cli/command/system/inspect.go

@@ -102,7 +102,7 @@ func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool,
 		ObjectInspector func(string) (interface{}, []byte, error)
 		ObjectInspector func(string) (interface{}, []byte, error)
 	}{
 	}{
 		{"container", true, inspectContainers(ctx, dockerCli, getSize)},
 		{"container", true, inspectContainers(ctx, dockerCli, getSize)},
-		{"image", true, inspectImages(ctx, dockerCli)},
+		{"image", false, inspectImages(ctx, dockerCli)},
 		{"network", false, inspectNetwork(ctx, dockerCli)},
 		{"network", false, inspectNetwork(ctx, dockerCli)},
 		{"volume", false, inspectVolume(ctx, dockerCli)},
 		{"volume", false, inspectVolume(ctx, dockerCli)},
 		{"service", false, inspectService(ctx, dockerCli)},
 		{"service", false, inspectService(ctx, dockerCli)},
@@ -126,7 +126,7 @@ func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool,
 				}
 				}
 				return v, raw, err
 				return v, raw, err
 			}
 			}
-			if !inspectData.IsSizeSupported {
+			if getSize && !inspectData.IsSizeSupported {
 				fmt.Fprintf(dockerCli.Err(), "WARNING: --size ignored for %s\n", inspectData.ObjectType)
 				fmt.Fprintf(dockerCli.Err(), "WARNING: --size ignored for %s\n", inspectData.ObjectType)
 			}
 			}
 			return v, raw, err
 			return v, raw, err