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

oci: use mediatype helpers

Browse Source 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
This commit is contained in:
Bjorn Neergaard 2023-09-27 11:45:32 -06:00
parent cdba61603c
commit 0ba5b4b62c
No known key found for this signature in database
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
oci/spec_opts.go
View File

@ -376,27 +376,25 @@ func WithImageConfigArgs(image Image, args []string) SpecOpts {
if err != nil { if err != nil {
return err return err
} }
if !images.IsConfigType(ic.MediaType) {
return fmt.Errorf("unknown image config media type %s", ic.MediaType)
}
var ( var (
imageConfigBytes []byte imageConfigBytes []byte
ociimage v1.Image ociimage v1.Image
config v1.ImageConfig config v1.ImageConfig
) )
switch ic.MediaType { imageConfigBytes, err = content.ReadBlob(ctx, image.ContentStore(), ic)
case v1.MediaTypeImageConfig, images.MediaTypeDockerSchema2Config: if err != nil {
var err error return err
imageConfigBytes, err = content.ReadBlob(ctx, image.ContentStore(), ic)
if err != nil {
return err
}
if err := json.Unmarshal(imageConfigBytes, &ociimage); err != nil {
return err
}
config = ociimage.Config
default:
return fmt.Errorf("unknown image config media type %s", ic.MediaType)
} }
if err = json.Unmarshal(imageConfigBytes, &ociimage); err != nil {
return err
}
config = ociimage.Config
appendOSMounts(s, ociimage.OS) appendOSMounts(s, ociimage.OS)
setProcess(s) setProcess(s)
if s.Linux != nil { if s.Linux != nil {