github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-06 09:21:28 +00:00
Code Issues Projects Releases Wiki Activity

Add all valid arches to ImageLoad

Browse Source 
We should expand the list of supported arches to be able to build them if we want. Without this we will stuck on sending tarball during build for riscv64.

Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
This commit is contained in:
Petr Fedchenkov
2022-09-08 12:14:49 +03:00
parent fc060cac15
commit 3699177d1a
1 changed files with 4 additions and 6 deletions
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 {