Skip to content

Commit

Permalink
pkg/container: resolve local manifest lists
Browse files Browse the repository at this point in the history
The local flag for manifest lists was hardcoded to `false` and so the
resolver was attempting to resolve a remote repo rather than local
storage.
  • Loading branch information
kingsleyzissou committed Apr 10, 2024
1 parent f9859a8 commit d693dc4
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions pkg/container/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -399,26 +399,26 @@ type resolvedIds struct {
ListManifest digest.Digest
}

func (cl *Client) resolveManifestList(ctx context.Context, list manifestList) (resolvedIds, error) {
func (cl *Client) resolveManifestList(ctx context.Context, list manifestList, local bool) (resolvedIds, error) {
digest, err := list.ChooseInstance(cl.sysCtx)
if err != nil {
return resolvedIds{}, err
}

raw, err := cl.GetManifest(ctx, &digest, false)
raw, err := cl.GetManifest(ctx, &digest, local)
if err != nil {
return resolvedIds{}, fmt.Errorf("error getting manifest: %w", err)
}

ids, err := cl.resolveRawManifest(ctx, raw)
ids, err := cl.resolveRawManifest(ctx, raw, local)
if err != nil {
return resolvedIds{}, err
}

return ids, err
}

func (cl *Client) resolveRawManifest(ctx context.Context, rm RawManifest) (resolvedIds, error) {
func (cl *Client) resolveRawManifest(ctx context.Context, rm RawManifest, local bool) (resolvedIds, error) {

var imageID digest.Digest

Expand All @@ -430,7 +430,7 @@ func (cl *Client) resolveRawManifest(ctx context.Context, rm RawManifest) (resol
}

// Save digest of the manifest list as well.
ids, err := cl.resolveManifestList(ctx, list)
ids, err := cl.resolveManifestList(ctx, list, local)
if err != nil {
return resolvedIds{}, err
}
Expand All @@ -445,7 +445,7 @@ func (cl *Client) resolveRawManifest(ctx context.Context, rm RawManifest) (resol
}

// Save digest of the manifest list as well.
ids, err := cl.resolveManifestList(ctx, index)
ids, err := cl.resolveManifestList(ctx, index, local)
if err != nil {
return resolvedIds{}, err
}
Expand Down Expand Up @@ -496,7 +496,7 @@ func (cl *Client) Resolve(ctx context.Context, name string, local bool) (Spec, e
return Spec{}, fmt.Errorf("error getting manifest: %w", err)
}

ids, err := cl.resolveRawManifest(ctx, raw)
ids, err := cl.resolveRawManifest(ctx, raw, local)
if err != nil {
return Spec{}, err
}
Expand Down

0 comments on commit d693dc4

Please sign in to comment.