github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2938 from vishh/exec

Browse Source 
Updated docker version that supports exec to '1.3.0'.
This commit is contained in:
Brendan Burns 2014-12-15 14:49:12 -08:00
commit 2c64db5943
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/dockertools/docker.go
View File

@ -92,8 +92,8 @@ type dockerContainerCommandRunner struct {
client DockerInterface client DockerInterface
} }
// The first version of docker that supports exec natively is 1.1.3 // The first version of docker that supports exec natively is 1.3.0
var dockerVersionWithExec = []uint{1, 1, 3} var dockerVersionWithExec = []uint{1, 3, 0}
// Returns the major and minor version numbers of docker server. // Returns the major and minor version numbers of docker server.
func (d *dockerContainerCommandRunner) getDockerServerVersion() ([]uint, error) { func (d *dockerContainerCommandRunner) getDockerServerVersion() ([]uint, error) {

2
pkg/kubelet/dockertools/docker_test.go
View File

@ -143,7 +143,7 @@ func TestGetDockerServerVersion(t *testing.T) {
} }
func TestExecSupportExists(t *testing.T) { func TestExecSupportExists(t *testing.T) {
fakeDocker := &FakeDockerClient{VersionInfo: docker.Env{"Client version=1.2", "Server version=1.1.3", "Server API version=1.15"}} fakeDocker := &FakeDockerClient{VersionInfo: docker.Env{"Client version=1.2", "Server version=1.3.0", "Server API version=1.15"}}
runner := dockerContainerCommandRunner{fakeDocker} runner := dockerContainerCommandRunner{fakeDocker}
useNativeExec, err := runner.nativeExecSupportExists() useNativeExec, err := runner.nativeExecSupportExists()
if err != nil { if err != nil {