mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #26517 from yongtang/26493-inspect-size
Fix issue of `WARNING: --size ignored for volume` for `docker inspect`
This commit is contained in:
commit
04c189fa49
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue