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

remotes: FetchByDigest: propagate media type from config to desc

Browse Source 
A media type string passed via `WithMediaType()` was not propagated
to a descriptor returned by `FetchByDigest()`.

Follow-up to PR 8744

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2023-07-30 16:46:00 +09:00
parent 02e0fef84b
commit e9f2bba1f2
No known key found for this signature in database
GPG Key ID: 49524C6F9F638F1A
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/ctr/commands/content/content.go
View File

@ -491,10 +491,11 @@ var (
if err != nil { if err != nil {
return err 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 { if err != nil {
return err return err
} }
log.G(ctx).Debugf("desc=%+v", desc)
_, err = io.Copy(os.Stdout, rc) _, err = io.Copy(os.Stdout, rc)
rc.Close() rc.Close()
if err != nil { if err != nil {

3
core/remotes/docker/fetcher.go
View File

@ -256,6 +256,9 @@ func (r dockerFetcher) FetchByDigest(ctx context.Context, dgst digest.Digest, op
Digest: dgst, Digest: dgst,
Size: sz, Size: sz,
} }
if config.Mediatype != "" {
desc.MediaType = config.Mediatype
}
return seeker, desc, nil return seeker, desc, nil
} }