github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 02:21:34 +00:00
Code Issues Projects Releases Wiki Activity

check for arch when pulling to cache, push by descriptor

Browse Source 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher 2021-06-21 23:33:34 +03:00
parent ccece6a488
commit a05b0ac923
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cmd/linuxkit/cache/pull.go vendored
View File

@ -2,6 +2,7 @@ package cache
import (
"errors"
"fmt"
"github.com/containerd/containerd/reference"
"github.com/google/go-containerregistry/pkg/v1"
@ -28,6 +29,9 @@ func (p *Provider) ValidateImage(ref *reference.Spec, architecture string) (lkts
if desc, err = partial.Descriptor(img); err != nil {
return ImageSource{}, errors.New("image could not create valid descriptor")
}
if desc.Platform == nil || desc.Platform.Architecture != architecture || desc.Platform.OS != "linux" {
return ImageSource{}, fmt.Errorf("image was not for requested architecture: linux/%s", architecture)
}
} else {
ii, err := root.ImageIndex()
if err == nil {
@ -36,6 +40,20 @@ func (p *Provider) ValidateImage(ref *reference.Spec, architecture string) (lkts
return ImageSource{}, errors.New("index could not create valid descriptor")
}
}
// check that the index has a manifest for our arch
im, err := imageIndex.IndexManifest()
if err != nil {
return ImageSource{}, fmt.Errorf("could not get index manifest: %v", err)
}
for _, m := range im.Manifests {
if m.Platform != nil && m.Platform.Architecture == architecture && m.Platform.OS == "linux" {
return p.NewSource(
ref,
architecture,
desc,
), nil
}
}
}
}
// three possibilities now:

8
src/cmd/linuxkit/cache/push.go vendored
View File

@ -58,13 +58,9 @@ func (p *Provider) Push(name string) error {
if err != nil {
return fmt.Errorf("could not create a valid arch-specific tag %s: %v", archTag, err)
}
image, err := p.FindRoot(archTag)
img, err := p.cache.Image(m.Digest)
if err != nil {
return fmt.Errorf("could not find arch-specific image in cache %s: %v", archTag, err)
}
img, err := image.Image()
if err != nil {
return fmt.Errorf("found arch-specific image in cache %s, but could not resolve to actual image: %v", archTag, err)
return fmt.Errorf("could not find arch-specific image in cache %s: %v", m.Digest, err)
}
log.Debugf("pushing image %s", tag)
if err := remote.Tag(tag, img, options...); err != nil {

7
src/cmd/linuxkit/cache/write.go vendored
View File

@ -82,11 +82,8 @@ func (p *Provider) ImagePull(ref *reference.Spec, trustedRef, architecture strin
if err != nil {
return ImageSource{}, fmt.Errorf("unable to save image to cache: %v", err)
}
return p.NewSource(
ref,
architecture,
&desc.Descriptor,
), nil
// ensure it includes our architecture
return p.ValidateImage(ref, architecture)
}
// ImageLoad takes an OCI format image tar stream and writes it locally. It should be