diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-19 13:57:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-19 13:57:15 +0200 |
commit | bd0b05f13860b62de389ec67eadd0df6b44d4f4f (patch) | |
tree | f2ceb2257d86ff0348b3c60a100b3e3e3f9033e5 /pkg/adapter/runtime.go | |
parent | befaa95d93481eef0d75d3babce7c6c643ecf85f (diff) | |
parent | 582a24dfed12da93a3a5e36ad269787b4ece93fc (diff) | |
download | podman-bd0b05f13860b62de389ec67eadd0df6b44d4f4f.tar.gz podman-bd0b05f13860b62de389ec67eadd0df6b44d4f4f.tar.bz2 podman-bd0b05f13860b62de389ec67eadd0df6b44d4f4f.zip |
Merge pull request #3709 from mheon/volume_inspect
Change backend code for 'volume inspect'
Diffstat (limited to 'pkg/adapter/runtime.go')
-rw-r--r-- | pkg/adapter/runtime.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go index ba988aaf7..7d4f97b28 100644 --- a/pkg/adapter/runtime.go +++ b/pkg/adapter/runtime.go @@ -210,7 +210,7 @@ func (r *LocalRuntime) Push(ctx context.Context, srcName, destination, manifestM } // InspectVolumes returns a slice of volumes based on an arg list or --all -func (r *LocalRuntime) InspectVolumes(ctx context.Context, c *cliconfig.VolumeInspectValues) ([]*Volume, error) { +func (r *LocalRuntime) InspectVolumes(ctx context.Context, c *cliconfig.VolumeInspectValues) ([]*libpod.InspectVolumeData, error) { var ( volumes []*libpod.Volume err error @@ -230,7 +230,17 @@ func (r *LocalRuntime) InspectVolumes(ctx context.Context, c *cliconfig.VolumeIn if err != nil { return nil, err } - return libpodVolumeToVolume(volumes), nil + + inspectVols := make([]*libpod.InspectVolumeData, 0, len(volumes)) + for _, vol := range volumes { + inspectOut, err := vol.Inspect() + if err != nil { + return nil, errors.Wrapf(err, "error inspecting volume %s", vol.Name()) + } + inspectVols = append(inspectVols, inspectOut) + } + + return inspectVols, nil } // Volumes returns a slice of localruntime volumes |