dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-04 15:11:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

builder/builder-next: puller.resolve: rename err-return

Browse Source 
Prevent accidentally shadowing the error, which is used in a defers, and
while at it, also fixed some linting warnings about unhandled errors and
shadowed vars.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2023-12-28 11:29:54 +01:00
parent 3f2296cfc1
commit 49d5b2cc8e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builder/builder-next/adapters/containerimage/pull.go
View File

@@ -343,10 +343,10 @@ func (p *puller) resolveLocal() {
}
func (p *puller) resolve(ctx context.Context, g session.Group) error {
_, err := p.g.Do(ctx, "", func(ctx context.Context) (_ struct{}, err error) {
_, err := p.g.Do(ctx, "", func(ctx context.Context) (_ struct{}, retErr error) {
resolveProgressDone := oneOffProgress(ctx, "resolve "+p.src.Reference.String())
defer func() {
resolveProgressDone(err)
_ = resolveProgressDone(retErr)
}()
ref, err := distreference.ParseNormalizedNamed(p.src.Reference.String())
@@ -370,11 +370,11 @@ func (p *puller) resolve(ctx context.Context, g session.Group) error {
// It may be possible to have a mapping between schema 1 manifests
// and the schema 2 manifests they are converted to.
if p.config == nil && p.desc.MediaType != c8dimages.MediaTypeDockerSchema1Manifest {
ref, err := distreference.WithDigest(ref, p.desc.Digest)
refWithDigest, err := distreference.WithDigest(ref, p.desc.Digest)
if err != nil {
return struct{}{}, err
}
_, dt, err := p.is.ResolveImageConfig(ctx, ref.String(), sourceresolver.Opt{
_, dt, err := p.is.ResolveImageConfig(ctx, refWithDigest.String(), sourceresolver.Opt{
Platform: &p.platform,
ImageOpt: &sourceresolver.ResolveImageOpt{
ResolveMode: p.src.ResolveMode.String(),
@@ -384,7 +384,7 @@ func (p *puller) resolve(ctx context.Context, g session.Group) error {
return struct{}{}, err
}
p.ref = ref.String()
p.ref = refWithDigest.String()
p.config = dt
}
return struct{}{}, nil