prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #353 from rjnagal/version

Browse Source 
Bump minimum docker supported version to 1.0.
This commit is contained in:
Victor Marmol 2014-12-16 01:14:31 +08:00
commit 7c60a8fc41
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
container/docker/factory.go
View File

@ -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)
}
}
}