From 7d7a002e51a1a1172f09741896f0a6c001438a49 Mon Sep 17 00:00:00 2001 From: Srini Brahmaroutu Date: Thu, 29 Jan 2015 18:36:56 +0000 Subject: [PATCH] Removing the check on Architecture to build and run Docker on IBM Power and Z platforms Signed-off-by: Srini Brahmaroutu --- daemon/daemon.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index c03e9d7aa8..c9a730b1f9 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -820,7 +820,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error) if os.Geteuid() != 0 { 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 } @@ -1205,11 +1205,7 @@ func (daemon *Daemon) ImageGetCached(imgID string, config *runconfig.Config) (*i return match, nil } -func checkKernelAndArch() 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) - } +func checkKernel() error { // Check for unsupported kernel versions // FIXME: it would be cleaner to not test for specific versions, but rather // test for specific functionalities.