Removing the check on Architecture to build and run Docker on IBM Power and Z platforms
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
This commit is contained in:
parent
5b9b5aff06
commit
7d7a002e51
|
@ -820,7 +820,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
|
||||||
if os.Geteuid() != 0 {
|
if os.Geteuid() != 0 {
|
||||||
return nil, fmt.Errorf("The Docker daemon needs to be run as root")
|
return nil, fmt.Errorf("The Docker daemon needs to be run as root")
|
||||||
}
|
}
|
||||||
if err := checkKernelAndArch(); err != nil {
|
if err := checkKernel(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1205,11 +1205,7 @@ func (daemon *Daemon) ImageGetCached(imgID string, config *runconfig.Config) (*i
|
||||||
return match, nil
|
return match, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkKernelAndArch() error {
|
func checkKernel() error {
|
||||||
// Check for unsupported architectures
|
|
||||||
if runtime.GOARCH != "amd64" {
|
|
||||||
return fmt.Errorf("The Docker runtime currently only supports amd64 (not %s). This will change in the future. Aborting.", runtime.GOARCH)
|
|
||||||
}
|
|
||||||
// Check for unsupported kernel versions
|
// Check for unsupported kernel versions
|
||||||
// FIXME: it would be cleaner to not test for specific versions, but rather
|
// FIXME: it would be cleaner to not test for specific versions, but rather
|
||||||
// test for specific functionalities.
|
// test for specific functionalities.
|
||||||
|
|
Loading…
Reference in New Issue