From 1953bd0e94766575c4db7b1d31ed687ae3e10fed Mon Sep 17 00:00:00 2001 From: Rohit Jnagal Date: Mon, 15 Dec 2014 16:57:22 +0000 Subject: [PATCH] Bump minimum docker supported version to 1.0. --- container/docker/factory.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container/docker/factory.go b/container/docker/factory.go index 2f3b4977..ef1ef604 100644 --- a/container/docker/factory.go +++ b/container/docker/factory.go @@ -164,7 +164,7 @@ func Register(factory info.MachineInfoFactory) error { if version, err := client.Version(); err != nil { return fmt.Errorf("unable to communicate with docker daemon: %v", err) } else { - expected_version := []int{0, 11, 1} + expected_version := []int{1, 0, 0} version_string := version.Get("Version") version, err := parseDockerVersion(version_string) if err != nil { @@ -174,7 +174,7 @@ func Register(factory info.MachineInfoFactory) error { if number > expected_version[index] { break } else if number < expected_version[index] { - return fmt.Errorf("cAdvisor requires docker version above %v but we have found version %v reported as \"%v\"", expected_version, version, version_string) + return fmt.Errorf("cAdvisor requires docker version %v or above but we have found version %v reported as \"%v\"", expected_version, version, version_string) } } }