JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pull: fix second cachekey for schema1 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
docker-19.03
Tonis Tiigi 2019-02-25 17:16:12 -08:00
parent 86aba5ac27
commit 37567fc826
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/containerimage/pull.go
View File

@ -159,14 +159,18 @@ func (p *puller) CacheKey(ctx context.Context, index int) (string, bool, error)
} }
_, dt, err := imageutil.Config(ctx, ref.String(), p.Resolver, p.ContentStore, &p.Platform) _, dt, err := imageutil.Config(ctx, ref.String(), p.Resolver, p.ContentStore, &p.Platform)
if err != nil { if err != nil {
// this happens on schema1 images return "", false, err
}
k := cacheKeyFromConfig(dt).String()
if k == "" {
k, err := mainManifestKey(ctx, desc, p.Platform) k, err := mainManifestKey(ctx, desc, p.Platform)
if err != nil { if err != nil {
return "", false, err return "", false, err
} }
return k.String(), true, nil return k.String(), true, nil
} }
return cacheKeyFromConfig(dt).String(), true, nil return k, true, nil
} }
func (p *puller) Snapshot(ctx context.Context) (cache.ImmutableRef, error) { func (p *puller) Snapshot(ctx context.Context) (cache.ImmutableRef, error) {
@ -225,8 +229,8 @@ func cacheKeyFromConfig(dt []byte) digest.Digest {
if err != nil { if err != nil {
return digest.FromBytes(dt) return digest.FromBytes(dt)
} }
if img.RootFS.Type != "layers" { if img.RootFS.Type != "layers" || len(img.RootFS.DiffIDs) == 0 {
return digest.FromBytes(dt) return ""
} }
return identity.ChainID(img.RootFS.DiffIDs) return identity.ChainID(img.RootFS.DiffIDs)
} }