From 1b1eb094cc5802ced2a8d993880992b3daf800bd Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Fri, 13 Nov 2020 02:29:50 +0000 Subject: [PATCH] builder-next: simple refactor Signed-off-by: Tibor Vass --- builder/builder-next/adapters/containerimage/pull.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go index 65f7f58d5c..29321db80b 100644 --- a/builder/builder-next/adapters/containerimage/pull.go +++ b/builder/builder-next/adapters/containerimage/pull.go @@ -191,7 +191,7 @@ func (p *puller) resolver(g session.Group) remotes.Resolver { return resolver.DefaultPool.GetResolver(p.is.RegistryHosts, p.src.Reference.String(), "pull", p.sm, g) } -func (p *puller) mainManifestKey(dgst digest.Digest, platform ocispec.Platform) (digest.Digest, error) { +func (p *puller) mainManifestKey(platform ocispec.Platform) (digest.Digest, error) { dt, err := json.Marshal(struct { Digest digest.Digest OS string @@ -301,7 +301,7 @@ func (p *puller) CacheKey(ctx context.Context, g session.Group, index int) (stri p.resolveLocal() if p.desc.Digest != "" && index == 0 { - dgst, err := p.mainManifestKey(p.desc.Digest, p.platform) + dgst, err := p.mainManifestKey(p.platform) if err != nil { return "", nil, false, err } @@ -321,7 +321,7 @@ func (p *puller) CacheKey(ctx context.Context, g session.Group, index int) (stri } if p.desc.Digest != "" && index == 0 { - dgst, err := p.mainManifestKey(p.desc.Digest, p.platform) + dgst, err := p.mainManifestKey(p.platform) if err != nil { return "", nil, false, err } @@ -330,7 +330,7 @@ func (p *puller) CacheKey(ctx context.Context, g session.Group, index int) (stri k := cacheKeyFromConfig(p.config).String() if k == "" { - dgst, err := p.mainManifestKey(p.desc.Digest, p.platform) + dgst, err := p.mainManifestKey(p.platform) if err != nil { return "", nil, false, err }