Skip to content

Commit 2914830

Browse files
carlosromancarlosroman
committed
chore: upgraded Docker client to latest version
1 parent 30f8521 commit 2914830

File tree

5 files changed

+24
-6
lines changed

5 files changed

+24
-6
lines changed

‎go.mod‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ require (
88
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
99
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6
1010
github.com/aws/aws-sdk-go v1.25.14-0.20200515182354-0961961790e6
11+
github.com/containerd/containerd v1.3.7 // indirect
1112
github.com/coreos/go-systemd/v22 v22.1.0
12-
github.com/docker/distribution v2.7.0-rc.0.0.20181024170156-93e082742a00+incompatible // indirect
13-
github.com/docker/docker v17.12.0-ce-rc1.0.20181123102044-618741ba87e9+incompatible
13+
github.com/docker/distribution v2.7.1+incompatible // indirect
14+
github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
1415
github.com/docker/go-connections v0.4.0 // indirect
15-
github.com/docker/go-units v0.2.1-0.20151230175859-0bbddae09c5a // indirect
16+
github.com/docker/go-units v0.4.0 // indirect
1617
github.com/evanphx/json-patch v4.5.0+incompatible
1718
github.com/fortytw2/leaktest v1.3.1-0.20190606143808-d73c753520d9
1819
github.com/fsnotify/fsnotify v0.9.3
@@ -27,6 +28,7 @@ require (
2728
github.com/kelseyhightower/envconfig v1.4.0
2829
github.com/kolo/xmlrpc v0.0.0-20200310150728-e0350524596b
2930
github.com/kr/pretty v0.2.0 // indirect
31+
github.com/morikuni/aec v1.0.0 // indirect
3032
github.com/newrelic-forks/newrelic-telemetry-sdk-go v0.2.1-0.20200423081332-b6856fd89c75
3133
github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2 // indirect
3234
github.com/opencontainers/image-spec v1.0.2-0.20181029102219-09950c5fb1bb // indirect

‎go.sum‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,31 @@ github.com/aws/aws-sdk-go v1.25.14-0.20200515182354-0961961790e6/go.mod h1:5zCpM
1313
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
1414
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
1515
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
16+
github.com/containerd/containerd v1.3.7 h1:eFSOChY8TTcxvkzp8g+Ov1RL0MYww7XEeK0y+zqGpVc=
17+
github.com/containerd/containerd v1.3.7/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
1618
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1719
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1820
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1921
github.com/docker/distribution v2.7.0-rc.0.0.20181024170156-93e082742a00+incompatible h1:YOfVNTgst//UrD5ZhDfbY0+GTSWjXfXOYLYHhw0kMpo=
2022
github.com/docker/distribution v2.7.0-rc.0.0.20181024170156-93e082742a00+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
23+
github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
24+
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
25+
github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
26+
github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
27+
github.com/docker/docker v17.12.0-ce-rc1+incompatible h1:nCIpLlton4k6x5kKJBtwjLyEmR5nR/MLOchPJO8Ddzk=
28+
github.com/docker/docker v17.12.0-ce-rc1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
2129
github.com/docker/docker v17.12.0-ce-rc1.0.20181123102044-618741ba87e9+incompatible h1:YsbaHGrJuAMf1uHGPhBD54cpVNMXRccI3PLsKScBWoE=
2230
github.com/docker/docker v17.12.0-ce-rc1.0.20181123102044-618741ba87e9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
31+
github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible h1:iWPIG7pWIsCwT6ZtHnTUpoVMnete7O/pzd9HFE3+tn8=
32+
github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
33+
github.com/docker/docker v17.12.1-ce+incompatible h1:JF3ixBk1BbHBmKGimGdei9/2mFcc2rKOReZ+nketjOI=
34+
github.com/docker/docker v17.12.1-ce+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
2335
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
2436
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
2537
github.com/docker/go-units v0.2.1-0.20151230175859-0bbddae09c5a h1:42qf1j6VWt3GUQzr0Hy8EL3DhNzLBiuWw5wQjNBlFyo=
2638
github.com/docker/go-units v0.2.1-0.20151230175859-0bbddae09c5a/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
39+
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
40+
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
2741
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
2842
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
2943
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
@@ -71,6 +85,8 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
7185
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
7286
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
7387
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
88+
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
89+
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
7490
github.com/newrelic-forks/go-systemd/v22 v22.1.1 h1:IlK38H3JrNdqT8nHWJ7yIURbqQNaqKF9fjGfulsYgrc=
7591
github.com/newrelic-forks/go-systemd/v22 v22.1.1/go.mod h1:p4NfqokFlluq2+M0PT0C79+OFaaeBPRsuii4AN/fr38=
7692
github.com/newrelic-forks/newrelic-telemetry-sdk-go v0.2.1-0.20200423081332-b6856fd89c75 h1:tsQi4yUt3vLthaTiS1GiUdvEwWS1n1WASVODmpjSwtE=

‎pkg/ctl/sender/client_docker.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func NewContainerisedClient(apiVersion string, containerID string) (c Client, er
3535
return
3636
}
3737

38-
cl, err := client.NewClientWithOpts(client.FromEnv)
38+
cl, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
3939
if err != nil {
4040
err = errors.Wrap(err, "failed to initialize docker client")
4141
return

‎pkg/databind/internal/discovery/docker/docker.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func Discoverer(d discovery.Container) (fetchDiscoveries func() (discoveries []d
4141
func fetch(d discovery.Container, matcher *discovery.FieldsMatcher) ([]discovery.Discovery, error) {
4242
var matches []discovery.Discovery
4343

44-
dc, err := client.NewClientWithOpts(client.FromEnv, client.WithVersion(d.ApiVersion))
44+
dc, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
4545
if err != nil {
4646
return nil, err
4747
}

‎pkg/helpers/docker_utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (dc *DockerClient) Initialize(apiVersion string) (err error) {
3636
return ErrNoDockerd
3737
}
3838

39-
dc.client, err = client.NewClientWithOpts(client.FromEnv, client.WithVersion(apiVersion))
39+
dc.client, err = client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
4040
if err != nil {
4141
return errors.Wrap(err, "failed to initialize docker client")
4242
}

0 commit comments

Comments
 (0)