1
0
mirror of https://github.com/moby/moby.git synced 2025-12-24 13:21:20 +03:00

Remove the concept of a root dir out of engine

This makes the engine more general purpose so that we can
use it and the job routing functionality for reexec'ing our binary
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Conflicts:
	integration/runtime_test.go
This commit is contained in:
Michael Crosby
2014-03-14 16:53:43 -07:00
parent 817494d009
commit 672edfe807
8 changed files with 38 additions and 100 deletions

View File

@@ -7,6 +7,7 @@ import (
"io/ioutil"
"log"
"os"
"runtime"
"strings"
"github.com/dotcloud/docker/api"
@@ -121,7 +122,10 @@ func main() {
}
}
eng, err := engine.New(realRoot)
if err := checkKernelAndArch(); err != nil {
log.Fatal(err)
}
eng, err := engine.New()
if err != nil {
log.Fatal(err)
}
@@ -239,3 +243,27 @@ func main() {
func showVersion() {
fmt.Printf("Docker version %s, build %s\n", dockerversion.VERSION, dockerversion.GITCOMMIT)
}
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)
}
// Check for unsupported kernel versions
// FIXME: it would be cleaner to not test for specific versions, but rather
// test for specific functionalities.
// Unfortunately we can't test for the feature "does not cause a kernel panic"
// without actually causing a kernel panic, so we need this workaround until
// the circumstances of pre-3.8 crashes are clearer.
// For details see http://github.com/dotcloud/docker/issues/407
if k, err := utils.GetKernelVersion(); err != nil {
log.Printf("WARNING: %s\n", err)
} else {
if utils.CompareKernelVersion(k, &utils.KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}) < 0 {
if os.Getenv("DOCKER_NOWARN_KERNEL_VERSION") == "" {
log.Printf("WARNING: You are running linux kernel version %s, which might be unstable running docker. Please upgrade your kernel to 3.8.0.", k.String())
}
}
}
return nil
}