Merge pull request #3449 from crazy-max/v0.29_picks_0.29.1

[v0.29] cherry-picks for v0.29.1

Author: crazy-max

commands/imagetools/create.go

@@ -240,13 +240,12 @@ type descWithSource struct {
 }
 
 func filterPlatforms(dt []byte, desc ocispecs.Descriptor, srcMap map[digest.Digest]*imagetools.Source, plats []ocispecs.Platform) ([]byte, ocispecs.Descriptor, []descWithSource, error) {
-	if len(plats) == 0 {
-		return dt, desc, nil, nil
-	}
-
 	matcher := platforms.Any(plats...)
 
 	if !images.IsIndexType(desc.MediaType) {
+		if len(plats) == 0 {
+			return dt, desc, nil, nil
+		}
 		var mfst ocispecs.Manifest
 		if err := json.Unmarshal(dt, &mfst); err != nil {
 			return nil, ocispecs.Descriptor{}, nil, errors.Wrapf(err, "failed to parse manifest")
@@ -264,6 +263,24 @@ func filterPlatforms(dt []byte, desc ocispecs.Descriptor, srcMap map[digest.Dige
 	if err := json.Unmarshal(dt, &idx); err != nil {
 		return nil, ocispecs.Descriptor{}, nil, errors.Wrapf(err, "failed to parse index")
 	}
+	if len(plats) == 0 {
+		mfsts := make([]descWithSource, len(idx.Manifests))
+		for i, m := range idx.Manifests {
+			src, ok := srcMap[m.Digest]
+			if !ok {
+				defaultSource, ok := srcMap[desc.Digest]
+				if !ok {
+					return nil, ocispecs.Descriptor{}, nil, errors.Errorf("internal error: no source found for %s", m.Digest)
+				}
+				src = defaultSource
+			}
+			mfsts[i] = descWithSource{
+				Descriptor: m,
+				Source:     src,
+			}
+		}
+		return dt, desc, mfsts, nil
+	}
 
 	manifestMap := map[digest.Digest]ocispecs.Descriptor{}
 	for _, m := range idx.Manifests {

util/imagetools/create.go

@@ -222,6 +222,7 @@ func (r *Resolver) Push(ctx context.Context, ref reference.Named, desc ocispecs.
 
 func (r *Resolver) Copy(ctx context.Context, src *Source, dest reference.Named) error {
 	ctx = remotes.WithMediaTypeKeyPrefix(ctx, "application/vnd.in-toto+json", "intoto")
+	ctx = remotes.WithMediaTypeKeyPrefix(ctx, "application/vnd.oci.empty.v1+json", "empty")
 
 	// push by digest
 	p, err := r.resolver().Pusher(ctx, dest.Name())