More docker compat API fixes

Fixes wrong VirtualSize, ParentId, Architecture, Author, Os and OsVersion value

Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>

4 files changed, 49 insertions, 46 deletions

diff --git a/libpod/image/image.go b/libpod/image/image.go
index cecd64eb7..5c3f3b9e4 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -1222,6 +1222,11 @@ func (i *Image) inspect(ctx context.Context, calculateSize bool) (*inspect.Image
 		}
 	}
 
+	parent, err := i.ParentID(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	repoTags, err := i.RepoTags()
 	if err != nil {
 		return nil, err
@@ -1248,6 +1253,7 @@ func (i *Image) inspect(ctx context.Context, calculateSize bool) (*inspect.Image
 
 	data := &inspect.ImageData{
 		ID:           i.ID(),
+		Parent:       parent,
 		RepoTags:     repoTags,
 		RepoDigests:  repoDigests,
 		Comment:      comment,
@@ -1258,10 +1264,12 @@ func (i *Image) inspect(ctx context.Context, calculateSize bool) (*inspect.Image
 		Config:       &ociv1Img.Config,
 		Version:      info.DockerVersion,
 		Size:         size,
-		VirtualSize:  size,
-		Annotations:  annotations,
-		Digest:       i.Digest(),
-		Labels:       info.Labels,
+		// This is good enough for now, but has to be
+		// replaced later with correct calculation logic
+		VirtualSize: size,
+		Annotations: annotations,
+		Digest:      i.Digest(),
+		Labels:      info.Labels,
 		RootFS: &inspect.RootFS{
 			Type:   ociv1Img.RootFS.Type,
 			Layers: ociv1Img.RootFS.DiffIDs,
@@ -1505,6 +1513,15 @@ func (i *Image) GetParent(ctx context.Context) (*Image, error) {
 	return tree.parent(ctx, i)
 }
 
+// ParentID returns the image ID of the parent. Return empty string if a parent is not found.
+func (i *Image) ParentID(ctx context.Context) (string, error) {
+	parent, err := i.GetParent(ctx)
+	if err == nil && parent != nil {
+		return parent.ID(), nil
+	}
+	return "", err
+}
+
 // GetChildren returns a list of the imageIDs that depend on the image
 func (i *Image) GetChildren(ctx context.Context) ([]string, error) {
 	children, err := i.getChildren(ctx, true)
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go
index 25e7640b6..c9adde09d 100644
--- a/pkg/api/handlers/types.go
+++ b/pkg/api/handlers/types.go
@@ -178,55 +178,34 @@ type ExecStartConfig struct {
 }
 
 func ImageToImageSummary(l *libpodImage.Image) (*entities.ImageSummary, error) {
-	containers, err := l.Containers()
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to obtain Containers for image %s", l.ID())
-	}
-	containerCount := len(containers)
-
-	// FIXME: GetParent() panics
-	// parent, err := l.GetParent(context.TODO())
-	// if err != nil {
-	// 	return nil, errors.Wrapf(err, "failed to obtain ParentID for image %s", l.ID())
-	// }
-
-	labels, err := l.Labels(context.TODO())
+	imageData, err := l.Inspect(context.TODO())
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to obtain Labels for image %s", l.ID())
+		return nil, errors.Wrapf(err, "failed to obtain summary for image %s", l.ID())
 	}
 
-	size, err := l.Size(context.TODO())
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to obtain Size for image %s", l.ID())
-	}
-
-	repoTags, err := l.RepoTags()
+	containers, err := l.Containers()
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to obtain RepoTags for image %s", l.ID())
-	}
-
-	digests := make([]string, len(l.Digests()))
-	for i, d := range l.Digests() {
-		digests[i] = string(d)
+		return nil, errors.Wrapf(err, "failed to obtain Containers for image %s", l.ID())
 	}
+	containerCount := len(containers)
 
 	is := entities.ImageSummary{
 		ID:           l.ID(),
-		ParentId:     l.Parent,
-		RepoTags:     repoTags,
-		RepoDigests:  digests,
+		ParentId:     imageData.Parent,
+		RepoTags:     imageData.RepoTags,
+		RepoDigests:  imageData.RepoDigests,
 		Created:      l.Created().Unix(),
-		Size:         int64(*size),
+		Size:         imageData.Size,
 		SharedSize:   0,
-		VirtualSize:  l.VirtualSize,
-		Labels:       labels,
+		VirtualSize:  imageData.VirtualSize,
+		Labels:       imageData.Labels,
 		Containers:   containerCount,
 		ReadOnly:     l.IsReadOnly(),
 		Dangling:     l.Dangling(),
 		Names:        l.Names(),
-		Digest:       string(l.Digest()),
+		Digest:       string(imageData.Digest),
 		ConfigDigest: string(l.ConfigDigest),
-		History:      l.NamesHistory(),
+		History:      imageData.NamesHistory,
 	}
 	return &is, nil
 }
@@ -283,8 +262,8 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI
 		}
 	}
 	dockerImageInspect := docker.ImageInspect{
-		Architecture:  l.Architecture,
-		Author:        l.Author,
+		Architecture:  info.Architecture,
+		Author:        info.Author,
 		Comment:       info.Comment,
 		Config:        &config,
 		Created:       l.Created().Format(time.RFC3339Nano),
@@ -292,9 +271,9 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI
 		GraphDriver:   docker.GraphDriverData{},
 		ID:            fmt.Sprintf("sha256:%s", l.ID()),
 		Metadata:      docker.ImageMetadata{},
-		Os:            l.Os,
-		OsVersion:     l.Version,
-		Parent:        l.Parent,
+		Os:            info.Os,
+		OsVersion:     info.Version,
+		Parent:        info.Parent,
 		RepoDigests:   info.RepoDigests,
 		RepoTags:      info.RepoTags,
 		RootFS:        rootfs,
diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go
index 20ae0d0f6..c4b0b7712 100644
--- a/pkg/domain/infra/abi/images_list.go
+++ b/pkg/domain/infra/abi/images_list.go
@@ -38,10 +38,8 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
 			RepoDigests:  digests,
 			History:      img.NamesHistory(),
 			Names:        img.Names(),
-			ParentId:     img.Parent,
 			ReadOnly:     img.IsReadOnly(),
 			SharedSize:   0,
-			VirtualSize:  img.VirtualSize,
 			RepoTags:     img.Names(), // may include tags and digests
 		}
 		e.Labels, err = img.Labels(ctx)
@@ -60,6 +58,15 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
 			return nil, errors.Wrapf(err, "error retrieving size of image %q: you may need to remove the image to resolve the error", img.ID())
 		}
 		e.Size = int64(*sz)
+		// This is good enough for now, but has to be
+		// replaced later with correct calculation logic
+		e.VirtualSize = int64(*sz)
+
+		parent, err := img.ParentID(ctx)
+		if err != nil {
+			return nil, errors.Wrapf(err, "error retrieving parent of image %q: you may need to remove the image to resolve the error", img.ID())
+		}
+		e.ParentId = parent
 
 		summaries = append(summaries, &e)
 	}
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go
index 63a2df67a..ac9481797 100644
--- a/test/e2e/build_test.go
+++ b/test/e2e/build_test.go
@@ -239,7 +239,7 @@ RUN printenv http_proxy`
 		Expect(session.ExitCode()).To(Equal(0))
 
 		// Verify that OS and Arch are being set
-		inspect := podmanTest.PodmanNoCache([]string{"image", "inspect", "--format", "{{ index .Config.Labels }}", "test"})
+		inspect := podmanTest.Podman([]string{"image", "inspect", "--format", "{{ index .Config.Labels }}", "test"})
 		inspect.WaitWithDefaultTimeout()
 		data := inspect.OutputToString()
 		Expect(data).To(ContainSubstring(buildah.Version))