0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #33647 from johnstep/improve-load-error

Browse source 
Stop trying to load images on an incompatible OS
This commit is contained in:
Vincent Demeester 2017-06-29 16:12:32 +02:00 • committed by GitHub
commit 5fbc82128b
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
image/tarexport/load.go
View file

@ -79,6 +79,9 @@ func (l *tarexporter) Load(inTar io.ReadCloser, outStream io.Writer, quiet bool)
if err != nil {
return err
}
if err := checkCompatibleOS(img.OS); err != nil {
return err
}
var rootFS image.RootFS
rootFS = *img.RootFS
rootFS.DiffIDs = nil
@ -292,11 +295,18 @@ func (l *tarexporter) legacyLoadImage(oldID, sourceDir string, loadedMap map[str
return err
}
var img struct{ Parent string }
var img struct {
OS string
Parent string
}
if err := json.Unmarshal(imageJSON, &img); err != nil {
return err
}
if err := checkCompatibleOS(img.OS); err != nil {
return err
}
var parentID image.ID
if img.Parent != "" {
for {
@ -402,3 +412,20 @@ func checkValidParent(img, parent *image.Image) bool {
}
return true
}
func checkCompatibleOS(os string) error {
// TODO @jhowardmsft LCOW - revisit for simultaneous platforms
platform := runtime.GOOS
if system.LCOWSupported() {
platform = "linux"
}
// always compatible if the OS matches; also match an empty OS
if os == platform || os == "" {
return nil
}
// for compatibility, only fail if the image or runtime OS is Windows
if os == "windows" || platform == "windows" {
return fmt.Errorf("cannot load %s image on %s", os, platform)
}
return nil
}