Browse code

builder-next: simple refactor

Signed-off-by: Tibor Vass <tibor@docker.com>

Tibor Vass authored on 2020/11/13 11:29:50
Showing 1 changed files
... ...
@@ -191,7 +191,7 @@ func (p *puller) resolver(g session.Group) remotes.Resolver {
191 191
 	return resolver.DefaultPool.GetResolver(p.is.RegistryHosts, p.src.Reference.String(), "pull", p.sm, g)
192 192
 }
193 193
 
194
-func (p *puller) mainManifestKey(dgst digest.Digest, platform ocispec.Platform) (digest.Digest, error) {
194
+func (p *puller) mainManifestKey(platform ocispec.Platform) (digest.Digest, error) {
195 195
 	dt, err := json.Marshal(struct {
196 196
 		Digest  digest.Digest
197 197
 		OS      string
... ...
@@ -301,7 +301,7 @@ func (p *puller) CacheKey(ctx context.Context, g session.Group, index int) (stri
301 301
 	p.resolveLocal()
302 302
 
303 303
 	if p.desc.Digest != "" && index == 0 {
304
-		dgst, err := p.mainManifestKey(p.desc.Digest, p.platform)
304
+		dgst, err := p.mainManifestKey(p.platform)
305 305
 		if err != nil {
306 306
 			return "", nil, false, err
307 307
 		}
... ...
@@ -321,7 +321,7 @@ func (p *puller) CacheKey(ctx context.Context, g session.Group, index int) (stri
321 321
 	}
322 322
 
323 323
 	if p.desc.Digest != "" && index == 0 {
324
-		dgst, err := p.mainManifestKey(p.desc.Digest, p.platform)
324
+		dgst, err := p.mainManifestKey(p.platform)
325 325
 		if err != nil {
326 326
 			return "", nil, false, err
327 327
 		}
... ...
@@ -330,7 +330,7 @@ func (p *puller) CacheKey(ctx context.Context, g session.Group, index int) (stri
330 330
 
331 331
 	k := cacheKeyFromConfig(p.config).String()
332 332
 	if k == "" {
333
-		dgst, err := p.mainManifestKey(p.desc.Digest, p.platform)
333
+		dgst, err := p.mainManifestKey(p.platform)
334 334
 		if err != nil {
335 335
 			return "", nil, false, err
336 336
 		}