github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

pkg/display: use mediatype helpers

Browse Source 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
This commit is contained in:
Bjorn Neergaard 2023-09-27 11:12:47 -06:00
parent 5ab04ac5a1
commit 69034f7558
No known key found for this signature in database
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/display/manifest_printer.go
View File

@ -135,8 +135,7 @@ func (p *ImageTreePrinter) printManifestTree(ctx context.Context, desc ocispec.D
return err return err
} }
switch desc.MediaType { if images.IsManifestType(desc.MediaType) {
case images.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest:
var manifest ocispec.Manifest var manifest ocispec.Manifest
if err := json.Unmarshal(b, &manifest); err != nil { if err := json.Unmarshal(b, &manifest); err != nil {
return err return err
@ -158,8 +157,7 @@ func (p *ImageTreePrinter) printManifestTree(ctx context.Context, desc ocispec.D
} }
fmt.Fprintf(p.w, "%s%s @%s (%d bytes)\n", subprefix, manifest.Layers[i].MediaType, manifest.Layers[i].Digest, manifest.Layers[i].Size) fmt.Fprintf(p.w, "%s%s @%s (%d bytes)\n", subprefix, manifest.Layers[i].MediaType, manifest.Layers[i].Digest, manifest.Layers[i].Size)
} }
} else if images.IsIndexType(desc.MediaType) {
case images.MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex:
var idx ocispec.Index var idx ocispec.Index
if err := json.Unmarshal(b, &idx); err != nil { if err := json.Unmarshal(b, &idx); err != nil {
return err return err