diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-25 01:26:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-25 01:26:21 +0100 |
commit | 69b011d3ac39b985cdbd2bacfa1eaeba166bf224 (patch) | |
tree | 21791a26464b4fe55fd879b7c649ea8cd63884db /pkg/domain/infra/tunnel | |
parent | b4520649af59780df494d75f50d0b5081eafff04 (diff) | |
parent | 1d7cb7cc48d06631e2bdfd0e25eeccc8e87b042f (diff) | |
download | podman-69b011d3ac39b985cdbd2bacfa1eaeba166bf224.tar.gz podman-69b011d3ac39b985cdbd2bacfa1eaeba166bf224.tar.bz2 podman-69b011d3ac39b985cdbd2bacfa1eaeba166bf224.zip |
Merge pull request #5604 from jwhonce/wip/images
V2 podman images/image list
Diffstat (limited to 'pkg/domain/infra/tunnel')
-rw-r--r-- | pkg/domain/infra/tunnel/images.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index 718685e57..60df40498 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -32,23 +32,22 @@ func (ir *ImageEngine) Delete(ctx context.Context, nameOrId string, opts entitie return &report, err } -func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) (*entities.ImageListReport, error) { +func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) ([]*entities.ImageSummary, error) { images, err := images.List(ir.ClientCxt, &opts.All, opts.Filters) + if err != nil { return nil, err } - report := entities.ImageListReport{ - Images: make([]entities.ImageSummary, len(images)), - } + is := make([]*entities.ImageSummary, len(images)) for i, img := range images { hold := entities.ImageSummary{} if err := utils.DeepCopy(&hold, img); err != nil { return nil, err } - report.Images[i] = hold + is[i] = &hold } - return &report, nil + return is, nil } func (ir *ImageEngine) History(ctx context.Context, nameOrId string, opts entities.ImageHistoryOptions) (*entities.ImageHistoryReport, error) { |