Merge pull request #9149 from jsturtevant/cherry-pick-9142-on-1-7

dmcgowan · web-flow · commit 8664fcaa366d · 2023-10-06T12:12:22.000-07:00
diff --git a/image.go b/image.go
@@ -437,7 +437,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))
@@ -447,7 +455,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
`@@ -437,7 +437,15 @@ func (i *image) getLayers(ctx context.Context, platform platforms.MatchComparer,`
`437`	`437`	`if err != nil {`
`438`	`438`	`return nil, fmt.Errorf("failed to resolve rootfs: %w", err)`
`439`	`439`	`}`
`440`		`- if len(diffIDs) != len(manifest.Layers) {`
	`440`	`+`
	`441`	`+ // parse out the image layers from oci artifact layers`
	`442`	`+ imageLayers := []ocispec.Descriptor{}`
	`443`	`+ for _, ociLayer := range manifest.Layers {`
	`444`	`+ if images.IsLayerType(ociLayer.MediaType) {`
	`445`	`+ imageLayers = append(imageLayers, ociLayer)`
	`446`	`+ }`
	`447`	`+ }`
	`448`	`+ if len(diffIDs) != len(imageLayers) {`
`441`	`449`	`return nil, errors.New("mismatched image rootfs and manifest layers")`
`442`	`450`	`}`
`443`	`451`	`layers := make([]rootfs.Layer, len(diffIDs))`
`@@ -447,7 +455,7 @@ func (i *image) getLayers(ctx context.Context, platform platforms.MatchComparer,`
`447`	`455`	`MediaType: ocispec.MediaTypeImageLayer,`
`448`	`456`	`Digest: diffIDs[i],`
`449`	`457`	`}`
`450`		`- layers[i].Blob = manifest.Layers[i]`
	`458`	`+ layers[i].Blob = imageLayers[i]`
`451`	`459`	`}`
`452`	`460`	`return layers, nil`
`453`	`461`	`}`