diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-28 12:35:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-28 12:35:23 +0100 |
| commit | 24b4921508be011b8fc4707d262116f77c8a176b (patch) | |
| tree | c9e6252ca41e337e2c69804e107f4cb2db339b1a /libpod/container_inspect.go | |
| parent | 269b17349631e260cafda2a607c0650299705394 (diff) | |
| parent | 2a5c235f789e866cb2c1d0fd54cc23c13bc1fc69 (diff) | |
| download | podman-24b4921508be011b8fc4707d262116f77c8a176b.tar.gz podman-24b4921508be011b8fc4707d262116f77c8a176b.tar.bz2 podman-24b4921508be011b8fc4707d262116f77c8a176b.zip | |
Merge pull request #4753 from NevilleC/nc-missingsize
Ensure SizeRw is shown when a user does 'inspect --size -t container'.
Diffstat (limited to 'libpod/container_inspect.go')
| -rw-r--r-- | libpod/container_inspect.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 22afc61cc..639dd6e91 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -118,7 +118,7 @@ type InspectContainerData struct { BoundingCaps []string `json:"BoundingCaps"` ExecIDs []string `json:"ExecIDs"` GraphDriver *driver.Data `json:"GraphDriver"` - SizeRw int64 `json:"SizeRw,omitempty"` + SizeRw *int64 `json:"SizeRw,omitempty"` SizeRootFs int64 `json:"SizeRootFs,omitempty"` Mounts []InspectMount `json:"Mounts"` Dependencies []string `json:"Dependencies"` @@ -809,12 +809,13 @@ func (c *Container) getContainerInspectData(size bool, driverData *driver.Data) if err != nil { logrus.Errorf("error getting rootfs size %q: %v", config.ID, err) } + data.SizeRootFs = rootFsSize + rwSize, err := c.rwSize() if err != nil { logrus.Errorf("error getting rw size %q: %v", config.ID, err) } - data.SizeRootFs = rootFsSize - data.SizeRw = rwSize + data.SizeRw = &rwSize } return data, nil } |