kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

builder-next: simple refactor

Browse source 
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Tibor Vass 2020-11-13 02:29:50 +00:00
parent 3756668adb
commit 1b1eb094cc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
builder/builder-next/adapters/containerimage/pull.go
View file

@ -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) 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 { dt, err := json.Marshal(struct {
Digest digest.Digest Digest digest.Digest
OS string OS string
@ -301,7 +301,7 @@ func (p *puller) CacheKey(ctx context.Context, g session.Group, index int) (stri
p.resolveLocal() p.resolveLocal()
if p.desc.Digest != "" && index == 0 { if p.desc.Digest != "" && index == 0 {
dgst, err := p.mainManifestKey(p.desc.Digest, p.platform) dgst, err := p.mainManifestKey(p.platform)
if err != nil { if err != nil {
return "", nil, false, err 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 { if p.desc.Digest != "" && index == 0 {
dgst, err := p.mainManifestKey(p.desc.Digest, p.platform) dgst, err := p.mainManifestKey(p.platform)
if err != nil { if err != nil {
return "", nil, false, err 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() k := cacheKeyFromConfig(p.config).String()
if k == "" { if k == "" {
dgst, err := p.mainManifestKey(p.desc.Digest, p.platform) dgst, err := p.mainManifestKey(p.platform)
if err != nil { if err != nil {
return "", nil, false, err return "", nil, false, err
} }