opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-01 17:17:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4505 from vrothberg/arch

Browse Source 
container create: os/arch check
This commit is contained in:
OpenShift Merge Robot
2019-11-16 17:36:12 +01:00
committed by GitHub
parent 51c08f3be6 96ab0c64b4
commit c6f2383213
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/podman/shared/create.go
View File

@ -7,6 +7,7 @@ import (
"io"
"os"
"path/filepath"
goruntime "runtime"
"strconv"
"strings"
"syscall"
@ -88,9 +89,11 @@ func CreateContainer(ctx context.Context, c *GenericCLIResults, runtime *libpod.
return nil, nil, err
}
overrideOS := c.String("override-os")
overrideArch := c.String("override-arch")
dockerRegistryOptions := image.DockerRegistryOptions{
OSChoice: c.String("override-os"),
ArchitectureChoice: c.String("override-arch"),
OSChoice: overrideOS,
ArchitectureChoice: overrideArch,
}
newImage, err := runtime.ImageRuntime().New(ctx, name, rtc.SignaturePolicyPath, c.String("authfile"), writer, &dockerRegistryOptions, image.SigningOptions{}, nil, pullType)
@ -101,6 +104,15 @@ func CreateContainer(ctx context.Context, c *GenericCLIResults, runtime *libpod.
if err != nil {
return nil, nil, err
}
if overrideOS == "" && data.Os != goruntime.GOOS {
return nil, nil, errors.Errorf("incompatible image OS %q on %q host", data.Os, goruntime.GOOS)
}
if overrideArch == "" && data.Architecture != goruntime.GOARCH {
return nil, nil, errors.Errorf("incompatible image architecture %q on %q host", data.Architecture, goruntime.GOARCH)
}
names := newImage.Names()
if len(names) > 0 {
imageName = names[0]