Merge pull request containerd#8890 from AkihiroSuda/follow-up-8744

remotes: FetchByDigest: propagate media type from config to desc
Mirantis · Jan 25, 2024 · 8d417cb · 8d417cb
2 parents d5f7e54 + e9f2bba
commit 8d417cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cmd/ctr/commands/content/content.go b/cmd/ctr/commands/content/content.go
@@ -491,10 +491,11 @@ var (
 				if err != nil {
 					return err
 				}
-				rc, _, err := fetcherByDigest.FetchByDigest(ctx, dgst, remotes.WithMediaType(context.String("media-type")))
+				rc, desc, err := fetcherByDigest.FetchByDigest(ctx, dgst, remotes.WithMediaType(context.String("media-type")))
 				if err != nil {
 					return err
 				}
+				log.G(ctx).Debugf("desc=%+v", desc)
 				_, err = io.Copy(os.Stdout, rc)
 				rc.Close()
 				if err != nil {

diff --git a/core/remotes/docker/fetcher.go b/core/remotes/docker/fetcher.go
@@ -256,6 +256,9 @@ func (r dockerFetcher) FetchByDigest(ctx context.Context, dgst digest.Digest, op
 		Digest:    dgst,
 		Size:      sz,
 	}
+	if config.Mediatype != "" {
+		desc.MediaType = config.Mediatype
+	}
 	return seeker, desc, nil
 }