From 57650aa5f32479944c735994286cc74e6c36452b Mon Sep 17 00:00:00 2001
From: Qi Wang <qiwan@redhat.com>
Date: Wed, 21 Oct 2020 12:22:19 -0400
Subject: manifest list inspect single image

If the image name not a manifest list type, enable manifest inspect to return manifest of single image manifest type vnd.docker.distribution.manifest.v2+json.

Signed-off-by: Qi Wang <qiwan@redhat.com>
---
 pkg/domain/infra/abi/manifest.go | 23 +++++++++++++++--------
 test/e2e/manifest_test.go        |  5 +++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go
index 6c518e678..ad7128b42 100644
--- a/pkg/domain/infra/abi/manifest.go
+++ b/pkg/domain/infra/abi/manifest.go
@@ -25,6 +25,7 @@ import (
 	"github.com/containers/podman/v2/pkg/domain/entities"
 	"github.com/opencontainers/go-digest"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
+	"github.com/sirupsen/logrus"
 
 	"github.com/pkg/errors"
 )
@@ -90,10 +91,6 @@ func (ir *ImageEngine) ManifestInspect(ctx context.Context, name string) ([]byte
 			continue
 		}
 
-		if !manifest.MIMETypeIsMultiImage(manifestType) {
-			appendErr(errors.Errorf("manifest is of type %s (not a list type)", manifestType))
-			continue
-		}
 		result = manifestBytes
 		manType = manifestType
 		break
@@ -101,7 +98,18 @@ func (ir *ImageEngine) ManifestInspect(ctx context.Context, name string) ([]byte
 	if len(result) == 0 && latestErr != nil {
 		return nil, latestErr
 	}
-	if manType != manifest.DockerV2ListMediaType {
+
+	switch manType {
+	case manifest.DockerV2Schema2MediaType:
+		logrus.Warnf("Warning! The manifest type %s is not a manifest list but a single image.", manType)
+		schema2Manifest, err := manifest.Schema2FromManifest(result)
+		if err != nil {
+			return nil, errors.Wrapf(err, "error parsing manifest blob %q as a %q", string(result), manType)
+		}
+		if result, err = schema2Manifest.Serialize(); err != nil {
+			return nil, err
+		}
+	default:
 		listBlob, err := manifest.ListFromBlob(result, manType)
 		if err != nil {
 			return nil, errors.Wrapf(err, "error parsing manifest blob %q as a %q", string(result), manType)
@@ -113,10 +121,9 @@ func (ir *ImageEngine) ManifestInspect(ctx context.Context, name string) ([]byte
 		if result, err = list.Serialize(); err != nil {
 			return nil, err
 		}
-
 	}
-	err = json.Indent(&b, result, "", "    ")
-	if err != nil {
+
+	if err = json.Indent(&b, result, "", "    "); err != nil {
 		return nil, errors.Wrapf(err, "error rendering manifest %s for display", name)
 	}
 	return b.Bytes(), nil
diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go
index f984345f4..29a62e5bb 100644
--- a/test/e2e/manifest_test.go
+++ b/test/e2e/manifest_test.go
@@ -58,6 +58,11 @@ var _ = Describe("Podman manifest", func() {
 		session = podmanTest.PodmanNoCache([]string{"manifest", "inspect", "quay.io/libpod/busybox"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
+
+		// inspect manifest of single image
+		session = podmanTest.PodmanNoCache([]string{"manifest", "inspect", "quay.io/libpod/busybox@sha256:6655df04a3df853b029a5fac8836035ac4fab117800c9a6c4b69341bb5306c3d"})
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(Exit(0))
 	})
 
 	It("podman manifest add", func() {
-- 
cgit v1.2.3-54-g00ecf