Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/agent/engine/dockerclient/versions.go b/agent/engine/dockerclient/versions.go
- index 7528b24..fa147ed 100644
- --- a/agent/engine/dockerclient/versions.go
- +++ b/agent/engine/dockerclient/versions.go
- @@ -31,8 +31,12 @@ const (
- Version_1_21 DockerVersion = "1.21"
- Version_1_22 DockerVersion = "1.22"
- Version_1_23 DockerVersion = "1.23"
- + Version_1_24 DockerVersion = "1.24"
- + Version_1_25 DockerVersion = "1.25"
- + Version_1_26 DockerVersion = "1.26"
- + Version_1_27 DockerVersion = "1.27"
- - defaultVersion = Version_1_17
- + defaultVersion = Version_1_26
- )
- var supportedVersions []DockerVersion
- @@ -46,6 +50,10 @@ func init() {
- Version_1_21,
- Version_1_22,
- Version_1_23,
- + Version_1_24,
- + Version_1_25,
- + Version_1_26,
- + Version_1_27,
- }
- }
- diff --git a/agent/engine/dockerclient/versions_test.go b/agent/engine/dockerclient/versions_test.go
- index 283b659..00a9be5 100644
- --- a/agent/engine/dockerclient/versions_test.go
- +++ b/agent/engine/dockerclient/versions_test.go
- @@ -167,6 +167,10 @@ func TestFindAvailableVersiosn(t *testing.T) {
- mockClient121 := mock_dockeriface.NewMockClient(ctrl)
- mockClient122 := mock_dockeriface.NewMockClient(ctrl)
- mockClient123 := mock_dockeriface.NewMockClient(ctrl)
- + mockClient124 := mock_dockeriface.NewMockClient(ctrl)
- + mockClient125 := mock_dockeriface.NewMockClient(ctrl)
- + mockClient126 := mock_dockeriface.NewMockClient(ctrl)
- + mockClient127 := mock_dockeriface.NewMockClient(ctrl)
- expectedEndpoint := "expectedEndpoint"
- @@ -190,6 +194,14 @@ func TestFindAvailableVersiosn(t *testing.T) {
- return mockClient122, nil
- case Version_1_23:
- return mockClient123, nil
- + case Version_1_24:
- + return mockClient124, nil
- + case Version_1_25:
- + return mockClient125, nil
- + case Version_1_26:
- + return mockClient126, nil
- + case Version_1_27:
- + return mockClient127, nil
- default:
- t.Fatal("Unrecognized version")
- }
- @@ -203,8 +215,12 @@ func TestFindAvailableVersiosn(t *testing.T) {
- mockClient121.EXPECT().Ping()
- mockClient122.EXPECT().Ping()
- mockClient123.EXPECT().Ping()
- + mockClient124.EXPECT().Ping()
- + mockClient125.EXPECT().Ping()
- + mockClient126.EXPECT().Ping()
- + mockClient127.EXPECT().Ping()
- - expectedVersions := []DockerVersion{Version_1_17, Version_1_19, Version_1_20, Version_1_21, Version_1_22, Version_1_23}
- + expectedVersions := []DockerVersion{Version_1_17, Version_1_19, Version_1_20, Version_1_21, Version_1_22, Version_1_23, Version_1_24, Version_1_25, Version_1_26, Version_1_27}
- factory := NewFactory(expectedEndpoint)
- versions := factory.FindAvailableVersions()
- diff --git a/agent/functional_tests/tests/functionaltests_unix_test.go b/agent/functional_tests/tests/functionaltests_unix_test.go
- index 79e2c1a..3a6f1b7 100644
- --- a/agent/functional_tests/tests/functionaltests_unix_test.go
- +++ b/agent/functional_tests/tests/functionaltests_unix_test.go
- @@ -218,7 +218,7 @@ func TestDockerAuth(t *testing.T) {
- func TestSquidProxy(t *testing.T) {
- // Run a squid proxy manually, verify that the agent can connect through it
- - client, err := docker.NewVersionedClientFromEnv("1.17")
- + client, err := docker.NewVersionedClientFromEnv("1.27")
- require.NoError(t, err)
- squidImage := "127.0.0.1:51670/amazon/squid:latest"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
