Allow for images with artifacts to pull

jsturtevant · jsturtevant · commit 8066dd81ca67 · 2023-10-06T16:43:47.000Z
Signed-off-by: James Sturtevant <jstur@microsoft.com> (cherry picked from commit a9ba33f) Signed-off-by: James Sturtevant <jstur@microsoft.com>
diff --git a/image.go b/image.go
@@ -414,7 +414,15 @@ func (i *image) getLayers(ctx context.Context, platform platforms.MatchComparer,
 	if err != nil {
 		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")
 	}
 	layers := make([]rootfs.Layer, len(diffIDs))
@@ -424,7 +432,7 @@ func (i *image) getLayers(ctx context.Context, platform platforms.MatchComparer,
 			MediaType: ocispec.MediaTypeImageLayer,
 			Digest:    diffIDs[i],
 		}
-		layers[i].Blob = manifest.Layers[i]
+		layers[i].Blob = imageLayers[i]
 	}
 	return layers, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,15 @@ func (i *image) getLayers(ctx context.Context, platform platforms.MatchComparer,`
`414`	`414`	`if err != nil {`
`415`	`415`	`return nil, fmt.Errorf("failed to resolve rootfs: %w", err)`
`416`	`416`	`}`
`417`		`- if len(diffIDs) != len(manifest.Layers) {`
	`417`	`+`
	`418`	`+ // parse out the image layers from oci artifact layers`
	`419`	`+ imageLayers := []ocispec.Descriptor{}`
	`420`	`+ for _, ociLayer := range manifest.Layers {`
	`421`	`+ if images.IsLayerType(ociLayer.MediaType) {`
	`422`	`+ imageLayers = append(imageLayers, ociLayer)`
	`423`	`+ }`
	`424`	`+ }`
	`425`	`+ if len(diffIDs) != len(imageLayers) {`
`418`	`426`	`return nil, errors.New("mismatched image rootfs and manifest layers")`
`419`	`427`	`}`
`420`	`428`	`layers := make([]rootfs.Layer, len(diffIDs))`
`@@ -424,7 +432,7 @@ func (i *image) getLayers(ctx context.Context, platform platforms.MatchComparer,`
`424`	`432`	`MediaType: ocispec.MediaTypeImageLayer,`
`425`	`433`	`Digest: diffIDs[i],`
`426`	`434`	`}`
`427`		`- layers[i].Blob = manifest.Layers[i]`
	`435`	`+ layers[i].Blob = imageLayers[i]`
`428`	`436`	`}`
`429`	`437`	`return layers, nil`
`430`	`438`	`}`