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

pkg/unpack: use mediatype helpers

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

5
pkg/unpack/unpacker.go
View File

@ -179,8 +179,7 @@ func (u *Unpacker) Unpack(h images.Handler) images.Handler {
return children, err return children, err
} }
switch desc.MediaType { if images.IsManifestType(desc.MediaType) {
case images.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest:
var nonLayers []ocispec.Descriptor var nonLayers []ocispec.Descriptor
var manifestLayers []ocispec.Descriptor var manifestLayers []ocispec.Descriptor
// Split layers from non-layers, layers will be handled after // Split layers from non-layers, layers will be handled after
@ -203,7 +202,7 @@ func (u *Unpacker) Unpack(h images.Handler) images.Handler {
lock.Unlock() lock.Unlock()
children = nonLayers children = nonLayers
case images.MediaTypeDockerSchema2Config, ocispec.MediaTypeImageConfig: } else if images.IsConfigType(desc.MediaType) {
lock.Lock() lock.Lock()
l := layers[desc.Digest] l := layers[desc.Digest]
lock.Unlock() lock.Unlock()