diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-16 23:02:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 23:02:41 +0200 |
| commit | 89630adbc418eac4a7eddf683226ee61f24f93be (patch) | |
| tree | 314afdb1569357fdd31219d62a1d26b6b6de32e7 | |
| parent | d6965da26d194c7edfef65985d4a2c7b564a3fca (diff) | |
| parent | fb4148bc41f597f28c1007e5c359f8baa61275a9 (diff) | |
| download | podman-89630adbc418eac4a7eddf683226ee61f24f93be.tar.gz podman-89630adbc418eac4a7eddf683226ee61f24f93be.tar.bz2 podman-89630adbc418eac4a7eddf683226ee61f24f93be.zip | |
Merge pull request #6624 from rhatdan/mount
Fix podman-remote images
| -rw-r--r-- | libpod/image/image.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/tunnel/images.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go index 1101e35dc..d81f7e911 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -478,7 +478,7 @@ func (ir *Runtime) getImages(rwOnly bool) ([]*Image, error) { if err != nil { return nil, err } - newImages := make([]*Image, 0, len(images)) + newImages := []*Image{} for _, i := range images { if rwOnly && i.ReadOnly { continue diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index ec2c53c4f..fc7ac0aa8 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -39,7 +39,7 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) return nil, err } - is := make([]*entities.ImageSummary, 0, len(images)) + is := make([]*entities.ImageSummary, len(images)) for i, img := range images { hold := entities.ImageSummary{} if err := utils.DeepCopy(&hold, img); err != nil { |