follow-up to "setup nerdctl inspect cmd"

AkihiroSuda · AkihiroSuda · commit bcd29a709027 · 2021-06-19T18:00:07.000+09:00
Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
diff --git a/README.md b/README.md
@@ -195,6 +195,7 @@ It does not necessarily mean that the corresponding features are missing in cont
     - [:whale: nerdctl save](#whale-nerdctl-save)
     - [:whale: nerdctl tag](#whale-nerdctl-tag)
     - [:whale: nerdctl rmi](#whale-nerdctl-rmi)
+    - [:whale: nerdctl image inspect](#whale-nerdctl-image-inspect)
     - [:nerd_face: nerdctl image convert](#nerd_face-nerdctl-image-convert)
   - [Registry](#registry)
     - [:whale: nerdctl login](#whale-nerdctl-login)
@@ -621,6 +622,16 @@ Usage: `nerdctl rmi [OPTIONS] IMAGE [IMAGE...]`
 
 Unimplemented `docker rmi` flags: `--force`, `--no-prune`
 
+### :whale: nerdctl image inspect
+Display detailed information on one or more images.
+
+Usage: `nerctl image inspect [OPTIONS] NAME|ID [NAME|ID...]`
+
+Flags:
+- :nerd_face: `--mode=(dockercompat|native)`: Inspection mode. "native" produces more information.
+
+Unimplemented `docker image inspect` flags: `--format`
+
 ### :nerd_face: nerdctl image convert
 Convert an image format.
 
@@ -865,7 +876,6 @@ Image:
 - `docker export` and `docker import`
 - `docker history`
 
-- `docker image inspect`
 - `docker image prune`
 
 - `docker trust *`
diff --git a/pkg/imageinspector/imageinspector.go b/pkg/imageinspector/imageinspector.go
@@ -37,7 +37,7 @@ func Inspect(ctx context.Context, client *containerd.Client, image images.Image)
 		logrus.WithError(err).WithField("id", image.Name).Warnf("failed to inspect Rootfs")
 		return nil, err
 	}
-	n.ImageSpec = imageConfig
+	n.ImageConfig = imageConfig
 
 	cs := client.ContentStore()
 	config, err := image.Config(ctx, cs, platforms.DefaultStrict())
@@ -46,7 +46,7 @@ func Inspect(ctx context.Context, client *containerd.Client, image images.Image)
 		return nil, err
 	}
 
-	n.Descriptor = config
+	n.ImageConfigDesc = config
 	n.Image = image
 
 	return n, nil
diff --git a/pkg/inspecttypes/dockercompat/dockercompat.go b/pkg/inspecttypes/dockercompat/dockercompat.go
@@ -244,7 +244,7 @@ func ContainerFromNative(n *native.Container) (*Container, error) {
 func ImageFromNative(n *native.Image) (*Image, error) {
 	i := &Image{}
 
-	imgoci := n.ImageSpec
+	imgoci := n.ImageConfig
 
 	i.RootFS.Type = imgoci.RootFS.Type
 	diffIDs := imgoci.RootFS.DiffIDs
@@ -273,7 +273,7 @@ func ImageFromNative(n *native.Image) (*Image, error) {
 		ExposedPorts: portSet,
 	}
 
-	i.ID = n.Descriptor.Digest.String()
+	i.ID = n.ImageConfigDesc.Digest.String()
 
 	repository, tag := imgutil.ParseRepoTag(n.Image.Name)
 
diff --git a/pkg/inspecttypes/native/image.go b/pkg/inspecttypes/native/image.go
@@ -24,7 +24,8 @@ import (
 // Image corresponds to a containerd-native image object.
 // Not compatible with `docker image inspect`.
 type Image struct {
-	images.Image
-	ImageSpec  ocispec.Image      `json:"ImageSpec"`
-	Descriptor ocispec.Descriptor `json:"Descriptor"`
+	Image images.Image `json:"Image"`
+	// e.g., "application/vnd.docker.container.image.v1+json"
+	ImageConfigDesc ocispec.Descriptor `json:"ImageConfigDesc"`
+	ImageConfig     ocispec.Image      `json:"ImageConfig"`
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func Inspect(ctx context.Context, client *containerd.Client, image images.Image)`
`37`	`37`	`logrus.WithError(err).WithField("id", image.Name).Warnf("failed to inspect Rootfs")`
`38`	`38`	`return nil, err`
`39`	`39`	`}`
`40`		`- n.ImageSpec = imageConfig`
	`40`	`+ n.ImageConfig = imageConfig`
`41`	`41`
`42`	`42`	`cs := client.ContentStore()`
`43`	`43`	`config, err := image.Config(ctx, cs, platforms.DefaultStrict())`
`@@ -46,7 +46,7 @@ func Inspect(ctx context.Context, client *containerd.Client, image images.Image)`
`46`	`46`	`return nil, err`
`47`	`47`	`}`
`48`	`48`
`49`		`- n.Descriptor = config`
	`49`	`+ n.ImageConfigDesc = config`
`50`	`50`	`n.Image = image`
`51`	`51`
`52`	`52`	`return n, nil`