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

If docker /info does not include ServerVersion, fallback to /version

Browse Source
This commit is contained in:
Tim St. Clair 2016-04-08 16:56:17 -07:00
parent b553e02476
commit b768a9d1dc
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
container/docker/handler.go
View File

@ -439,10 +439,19 @@ func ValidateInfo() (*docker.DockerInfo, error) {
return nil, fmt.Errorf("failed to detect Docker info: %v", err) return nil, fmt.Errorf("failed to detect Docker info: %v", err)
} }
// Fall back to version API if ServerVersion is not set in info.
if dockerInfo.ServerVersion == "" {
version, err := client.Version()
if err != nil {
return nil, fmt.Errorf("unable to get docker version: %v", err)
}
dockerInfo.ServerVersion = version.Get("Version")
}
version, err := parseDockerVersion(dockerInfo.ServerVersion) version, err := parseDockerVersion(dockerInfo.ServerVersion)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if version[0] < 1 { if version[0] < 1 {
return nil, fmt.Errorf("cAdvisor requires docker version %v or above but we have found version %v reported as %q", []int{1, 0, 0}, version, dockerInfo.ServerVersion) return nil, fmt.Errorf("cAdvisor requires docker version %v or above but we have found version %v reported as %q", []int{1, 0, 0}, version, dockerInfo.ServerVersion)
} }