Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions pkg/container/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ func (cl *Client) GetManifest(ctx context.Context, instanceDigest digest.Digest,
if local {
localId, err = cl.getLocalImageIDFromDigest(instanceDigest)
if err != nil {
return r, err
return RawManifest{}, err
}
} else {
// We can pass the instance digest, if it is nil, then this is the primary manifest.
Expand All @@ -417,12 +417,12 @@ func (cl *Client) GetManifest(ctx context.Context, instanceDigest digest.Digest,

ref, err := cl.getImageRef(localId, local)
if err != nil {
return
return RawManifest{}, err
}

src, err := ref.NewImageSource(ctx, cl.sysCtx)
if err != nil {
return
return RawManifest{}, err
}

defer func() {
Expand Down Expand Up @@ -454,10 +454,10 @@ func (cl *Client) GetManifest(ctx context.Context, instanceDigest digest.Digest,

return nil
}, &retryOpts); err != nil {
return
return RawManifest{}, err
}

return
return r, nil
}

type manifestList interface {
Expand Down Expand Up @@ -533,19 +533,16 @@ func (cl *Client) resolveRawManifest(ctx context.Context, rm RawManifest, local

case manifest.DockerV2Schema2MediaType:
m, err := manifest.Schema2FromManifest(rm.Data)

if err != nil {
return resolvedIds{}, nil, nil
}

imageID = m.ConfigInfo().Digest

default:
return resolvedIds{}, nil, fmt.Errorf("unsupported manifest format '%s'", rm.MimeType)
}

dg, err := rm.Digest()

if err != nil {
return resolvedIds{}, nil, err
}
Expand Down
Loading
Loading