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

Merge pull request #9142 from jsturtevant/no-changes-wasm

Browse Source 
Allow for images with artifacts layers to pull and run
This commit is contained in:
Maksym Pavlenko 2023-09-25 19:03:06 -07:00 committed by GitHub
commit c33249cbe6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
image.go
View File

@ -379,7 +379,15 @@ func (i *image) getLayers(ctx context.Context, manifest ocispec.Manifest) ([]roo
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to resolve rootfs: %w", err) return nil, fmt.Errorf("failed to resolve rootfs: %w", err)
} }
if len(diffIDs) != len(manifest.Layers) {
// parse out the image layers from oci artifact layers
imageLayers := []ocispec.Descriptor{}
for _, ociLayer := range manifest.Layers {
if images.IsLayerType(ociLayer.MediaType) {
imageLayers = append(imageLayers, ociLayer)
}
}
if len(diffIDs) != len(imageLayers) {
return nil, errors.New("mismatched image rootfs and manifest layers") return nil, errors.New("mismatched image rootfs and manifest layers")
} }
layers := make([]rootfs.Layer, len(diffIDs)) layers := make([]rootfs.Layer, len(diffIDs))
@ -389,7 +397,7 @@ func (i *image) getLayers(ctx context.Context, manifest ocispec.Manifest) ([]roo
MediaType: ocispec.MediaTypeImageLayer, MediaType: ocispec.MediaTypeImageLayer,
Digest: diffIDs[i], Digest: diffIDs[i],
} }
layers[i].Blob = manifest.Layers[i] layers[i].Blob = imageLayers[i]
} }
return layers, nil return layers, nil
} }