github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3820 from giggsoff/fix-riscv64-arch

Browse Source 
Add all valid arches to ImageLoad
This commit is contained in:
Avi Deitcher 2022-09-08 14:16:03 +03:00 committed by GitHub
commit 9b636cbf25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import (
"strings" "strings"
"github.com/containerd/containerd/reference" "github.com/containerd/containerd/reference"
"github.com/estesp/manifest-tool/v2/pkg/util"
"github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/authn"
"github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/name"
v1 "github.com/google/go-containerregistry/pkg/v1" v1 "github.com/google/go-containerregistry/pkg/v1"
@ -117,13 +118,10 @@ func (p *Provider) ImageLoad(ref *reference.Spec, architecture string, r io.Read
tr = tar.NewReader(r) tr = tar.NewReader(r)
index bytes.Buffer index bytes.Buffer
) )
var suffix string if !util.IsValidOSArch(linux, architecture, "") {
switch architecture { return ImageSource{}, fmt.Errorf("unknown arch %s", architecture)
case "amd64", "arm64", "s390x":
suffix = "-" + architecture
default:
return ImageSource{}, fmt.Errorf("Unknown arch %q", architecture)
} }
suffix := "-" + architecture
imageName := ref.String() + suffix imageName := ref.String() + suffix
log.Debugf("ImageWriteTar to cache %s", imageName) log.Debugf("ImageWriteTar to cache %s", imageName)
for { for {