Merge pull request #72831 from yujuhong/bump-docker-version

Bump minimum docker version to 1.13.1
pull/564/head
Kubernetes Prow Robot 2019-01-11 15:54:11 -08:00 committed by GitHub
commit dc6f3d645d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -33,7 +33,7 @@ const (
FakeMemoryCapacity = 4026531840
FakeKernelVersion = "3.16.0-0.bpo.4-amd64"
FakeContainerOsVersion = "Debian GNU/Linux 7 (wheezy)"
FakeDockerVersion = "1.5.0"
FakeDockerVersion = "1.13.1"
)
var _ cadvisor.Interface = new(Fake)

View File

@ -28,8 +28,8 @@ import (
const (
// https://docs.docker.com/engine/reference/api/docker_remote_api/
// docker version should be at least 1.11.x
MinimumDockerAPIVersion = "1.23.0"
// docker version should be at least 1.13.1
MinimumDockerAPIVersion = "1.26.0"
// Status of a container returned by ListContainers.
StatusRunningPrefix = "Up"

View File

@ -81,7 +81,7 @@ type FakeDockerClient struct {
const (
// Notice that if someday we also have minimum docker version requirement, this should also be updated.
fakeDockerVersion = "1.11.2"
fakeDockerVersion = "1.13.1"
fakeImageSize = 1024