Skip to content

Commit 04e3bd3

Browse files
authored
Merge pull request #344 from krunalhinguu/bump-docker-version
Update Docker client implementation and dependencies
2 parents 02c01ab + 851958e commit 04e3bd3

File tree

6 files changed

+137
-97
lines changed

6 files changed

+137
-97
lines changed

go.mod

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ go 1.24.0
44

55
toolchain go1.24.2
66

7-
replace (
8-
github.com/docker/docker => github.com/moby/moby v1.4.2-0.20170731201646-1009e6a40b29
9-
github.com/urfave/cli => github.com/urfave/cli v1.11.1-0.20151120215642-0302d3914d2a // newer versions of this will break the rpc binding code
10-
)
7+
replace github.com/urfave/cli => github.com/urfave/cli v1.11.1-0.20151120215642-0302d3914d2a // newer versions of this will break the rpc binding code
118

129
require (
1310
github.com/Azure/azure-sdk-for-go v55.8.0+incompatible
@@ -18,13 +15,14 @@ require (
1815
github.com/aws/aws-sdk-go v1.55.5
1916
github.com/bugsnag/bugsnag-go v2.5.0+incompatible
2017
github.com/digitalocean/godo v0.0.0-20170317202744-d59ed2fe842b
21-
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
18+
github.com/docker/docker v25.0.8+incompatible
19+
github.com/docker/go-connections v0.5.0
2220
github.com/exoscale/egoscale v0.12.3
2321
github.com/gophercloud/gophercloud v0.7.0
2422
github.com/gophercloud/utils v0.0.0-20191129022341-463e26ffa30d
23+
github.com/moby/term v0.5.2
2524
github.com/rackspace/gophercloud v0.0.0-20150408191457-ce0f487f6747
26-
github.com/rancher/wrangler/v3 v3.2.2-rc.1
27-
github.com/samalba/dockerclient v0.0.0-20160531175551-a30362618471
25+
github.com/rancher/wrangler/v3 v3.2.0-rc.3
2826
github.com/skarademir/naturalsort v0.0.0-20150715044055-69a5d87bef62
2927
github.com/stretchr/testify v1.10.0
3028
github.com/urfave/cli v1.22.15
@@ -45,20 +43,23 @@ require (
4543
cloud.google.com/go/auth v0.15.0 // indirect
4644
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
4745
cloud.google.com/go/compute/metadata v0.6.0 // indirect
48-
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
46+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
4947
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
5048
github.com/Azure/go-autorest/autorest/azure/cli v0.3.1 // indirect
5149
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
5250
github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
5351
github.com/Azure/go-autorest/logger v0.2.1 // indirect
5452
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
53+
github.com/Microsoft/go-winio v0.6.2 // indirect
5554
github.com/bitly/go-simplejson v0.5.0 // indirect
5655
github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b // indirect
5756
github.com/bugsnag/panicwrap v0.0.0-20160118154447-aceac81c6e2f // indirect
5857
github.com/cenkalti/backoff v0.0.0-20141124221459-9831e1e25c87 // indirect
58+
github.com/containerd/log v0.1.0 // indirect
5959
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6060
github.com/dimchansky/utfbom v1.1.0 // indirect
61-
github.com/docker/go-units v0.4.0 // indirect
61+
github.com/distribution/reference v0.6.0 // indirect
62+
github.com/docker/go-units v0.5.0 // indirect
6263
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
6364
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
6465
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -77,7 +78,6 @@ require (
7778
github.com/google/uuid v1.6.0 // indirect
7879
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
7980
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
80-
github.com/gorilla/mux v1.7.3 // indirect
8181
github.com/jmespath/go-jmespath v0.4.0 // indirect
8282
github.com/josharian/intern v1.0.0 // indirect
8383
github.com/json-iterator/go v1.1.12 // indirect
@@ -87,7 +87,10 @@ require (
8787
github.com/mitchellh/mapstructure v1.1.2 // indirect
8888
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8989
github.com/modern-go/reflect2 v1.0.2 // indirect
90+
github.com/morikuni/aec v1.0.0 // indirect
9091
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
92+
github.com/opencontainers/go-digest v1.0.0 // indirect
93+
github.com/opencontainers/image-spec v1.1.1 // indirect
9194
github.com/pkg/errors v0.9.1 // indirect
9295
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
9396
github.com/rancher/lasso v0.2.3-rc1 // indirect
@@ -99,19 +102,23 @@ require (
99102
github.com/x448/float16 v0.8.4 // indirect
100103
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
101104
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
102-
go.opentelemetry.io/otel v1.34.0 // indirect
103-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
104-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
105+
go.opentelemetry.io/otel v1.35.0 // indirect
106+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
107+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
108+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
109+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
105110
golang.org/x/sync v0.12.0 // indirect
106111
golang.org/x/term v0.30.0 // indirect
107112
golang.org/x/text v0.23.0 // indirect
108113
golang.org/x/time v0.11.0 // indirect
114+
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
109115
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
110116
google.golang.org/grpc v1.71.0 // indirect
111117
google.golang.org/protobuf v1.36.6 // indirect
112118
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
113119
gopkg.in/inf.v0 v0.9.1 // indirect
114120
gopkg.in/yaml.v3 v3.0.1 // indirect
121+
gotest.tools/v3 v3.5.2 // indirect
115122
k8s.io/klog/v2 v2.130.1 // indirect
116123
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
117124
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

0 commit comments

Comments
 (0)