Skip to content

Commit 5274a32

Browse files
cq-botcq-bot
authored
fix(deps): Update module github.com/docker/docker to v26 (#292)
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/docker/docker](https://togithub.com/docker/docker) | require | major | `v24.0.9+incompatible` -> `v26.0.0+incompatible` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>docker/docker (github.com/docker/docker)</summary> ### [`v26.0.0+incompatible`](https://togithub.com/docker/docker/compare/v25.0.5...v26.0.0) [Compare Source](https://togithub.com/docker/docker/compare/v25.0.5...v26.0.0) ### [`v25.0.5+incompatible`](https://togithub.com/docker/docker/compare/v25.0.4...v25.0.5) [Compare Source](https://togithub.com/docker/docker/compare/v25.0.4...v25.0.5) ### [`v25.0.4+incompatible`](https://togithub.com/docker/docker/compare/v25.0.3...v25.0.4) [Compare Source](https://togithub.com/docker/docker/compare/v25.0.3...v25.0.4) ### [`v25.0.3+incompatible`](https://togithub.com/docker/docker/compare/v25.0.2...v25.0.3) [Compare Source](https://togithub.com/docker/docker/compare/v25.0.2...v25.0.3) ### [`v25.0.2+incompatible`](https://togithub.com/docker/docker/compare/v25.0.1...v25.0.2) [Compare Source](https://togithub.com/docker/docker/compare/v25.0.1...v25.0.2) ### [`v25.0.1+incompatible`](https://togithub.com/docker/docker/compare/v25.0.0...v25.0.1) [Compare Source](https://togithub.com/docker/docker/compare/v25.0.0...v25.0.1) ### [`v25.0.0+incompatible`](https://togithub.com/docker/docker/compare/v24.0.9...v25.0.0) [Compare Source](https://togithub.com/docker/docker/compare/v24.0.9...v25.0.0) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on the first day of the month" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yNzguMiIsInVwZGF0ZWRJblZlciI6IjM3LjI3OC4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
1 parent 0a138ea commit 5274a32

File tree

5 files changed

+63
-22
lines changed

5 files changed

+63
-22
lines changed

‎.golangci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
run:
22
tests: true
33
timeout: 10m
4-
skip-dirs:
4+
issues:
5+
exclude-dirs:
56
- internal/pb
67

78
linters-settings:
@@ -58,11 +59,10 @@ linters-settings:
5859

5960
gofmt:
6061
rewrite-rules:
61-
- pattern: 'interface{}'
62-
replacement: 'any'
63-
- pattern: 'a[b:len(a)]'
64-
replacement: 'a[b:]'
65-
62+
- pattern: "interface{}"
63+
replacement: "any"
64+
- pattern: "a[b:len(a)]"
65+
replacement: "a[b:]"
6666

6767
linters:
6868
enable:

‎go.mod‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require (
66
github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1
77
github.com/avast/retry-go/v4 v4.5.1
88
github.com/cloudquery/cloudquery-api-go v1.9.0
9-
github.com/distribution/reference v0.5.0
10-
github.com/docker/docker v24.0.9+incompatible
9+
github.com/distribution/reference v0.6.0
10+
github.com/docker/docker v26.0.0+incompatible
1111
github.com/docker/go-connections v0.5.0
1212
github.com/ghodss/yaml v1.0.0
1313
github.com/google/go-cmp v0.6.0
@@ -36,15 +36,18 @@ require (
3636
github.com/bytedance/sonic v1.10.2 // indirect
3737
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
3838
github.com/chenzhuoyu/iasm v0.9.1 // indirect
39+
github.com/containerd/log v0.1.0 // indirect
3940
github.com/davecgh/go-spew v1.1.1 // indirect
4041
github.com/deepmap/oapi-codegen v1.15.0 // indirect
41-
github.com/docker/distribution v2.8.3+incompatible // indirect
4242
github.com/docker/go-units v0.5.0 // indirect
4343
github.com/fatih/structs v1.1.0 // indirect
44+
github.com/felixge/httpsnoop v1.0.4 // indirect
4445
github.com/flosch/pongo2/v4 v4.0.2 // indirect
4546
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
4647
github.com/gin-contrib/sse v0.1.0 // indirect
4748
github.com/gin-gonic/gin v1.9.1 // indirect
49+
github.com/go-logr/logr v1.4.1 // indirect
50+
github.com/go-logr/stdr v1.2.2 // indirect
4851
github.com/go-playground/locales v0.14.1 // indirect
4952
github.com/go-playground/universal-translator v0.18.1 // indirect
5053
github.com/go-playground/validator/v10 v10.14.0 // indirect
@@ -77,6 +80,7 @@ require (
7780
github.com/mattn/go-isatty v0.0.20 // indirect
7881
github.com/microcosm-cc/bluemonday v1.0.26 // indirect
7982
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
83+
github.com/moby/docker-image-spec v1.3.1 // indirect
8084
github.com/moby/term v0.5.0 // indirect
8185
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8286
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -100,6 +104,12 @@ require (
100104
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
101105
github.com/yosssi/ace v0.0.5 // indirect
102106
github.com/zeebo/xxh3 v1.0.2 // indirect
107+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
108+
go.opentelemetry.io/otel v1.24.0 // indirect
109+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
110+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
111+
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
112+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
103113
golang.org/x/arch v0.3.0 // indirect
104114
golang.org/x/crypto v0.21.0 // indirect
105115
golang.org/x/mod v0.16.0 // indirect

‎go.sum‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1
3232
github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
3333
github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE=
3434
github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
35+
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
36+
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
3537
github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
3638
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
3739
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
@@ -41,18 +43,18 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0
4143
github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
4244
github.com/cloudquery/cloudquery-api-go v1.9.0 h1:yjy/Hrma6/1JdtGYE59xMtH+xAsaGLzoKVsbpuLJBuk=
4345
github.com/cloudquery/cloudquery-api-go v1.9.0/go.mod h1:F4kuaNBAVqsS9ZRHuX+tV2m6+Khoa2Rb9lROGhinGPk=
46+
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
47+
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
4448
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
4549
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4650
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
4751
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4852
github.com/deepmap/oapi-codegen v1.15.0 h1:SQqViaeb4k2vMul8gx12oDOIadEtoRqTdLkxjzqtQ90=
4953
github.com/deepmap/oapi-codegen v1.15.0/go.mod h1:a6KoHV7lMRwsPoEg2C6NDHiXYV3EQfiFocOlJ8dgJQE=
50-
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
51-
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
52-
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
53-
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
54-
github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0=
55-
github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
54+
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
55+
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
56+
github.com/docker/docker v26.0.0+incompatible h1:Ng2qi+gdKADUa/VM+6b6YaY2nlZhk/lVJiKR/2bMudU=
57+
github.com/docker/docker v26.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
5658
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
5759
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
5860
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -61,6 +63,8 @@ github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
6163
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
6264
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
6365
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
66+
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
67+
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
6468
github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw=
6569
github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8=
6670
github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
@@ -71,6 +75,11 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
7175
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
7276
github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
7377
github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
78+
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
79+
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
80+
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
81+
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
82+
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
7483
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
7584
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
7685
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -107,6 +116,8 @@ github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
107116
github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
108117
github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
109118
github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
119+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No=
120+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU=
110121
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
111122
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
112123
github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI=
@@ -171,6 +182,8 @@ github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2Em
171182
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
172183
github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
173184
github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
185+
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
186+
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
174187
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
175188
github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
176189
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -269,6 +282,22 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
269282
github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
270283
github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
271284
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
285+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
286+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
287+
go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
288+
go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
289+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8=
290+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0/go.mod h1:iSDOcsnSA5INXzZtwaBPrKp/lWu/V14Dd+llD0oI2EA=
291+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 h1:Xw8U6u2f8DK2XAkGRFV7BBLENgnTGX9i4rQRxJf+/vs=
292+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0/go.mod h1:6KW1Fm6R/s6Z3PGXwSJN2K4eT6wQB3vXX6CVnYX9NmM=
293+
go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
294+
go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
295+
go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
296+
go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
297+
go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
298+
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
299+
go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI=
300+
go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY=
272301
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
273302
golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
274303
golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
@@ -340,6 +369,9 @@ golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSm
340369
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
341370
gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o=
342371
gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY=
372+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ=
373+
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU=
374+
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA=
343375
google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641 h1:DKU1r6Tj5s1vlU/moGhuGz7E3xRfwjdAfDzbsaQJtEY=
344376
google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs=
345377
google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=

‎managedplugin/docker.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"strings"
99

1010
"github.com/distribution/reference"
11-
"github.com/docker/docker/api/types"
1211
"github.com/docker/docker/api/types/filters"
12+
"github.com/docker/docker/api/types/image"
1313
"github.com/docker/docker/api/types/registry"
1414
"github.com/docker/docker/client"
1515
"github.com/schollz/progressbar/v3"
@@ -87,7 +87,7 @@ func isDockerImageAvailable(ctx context.Context, imageName string) (bool, error)
8787
}
8888

8989
// List the images matching the given name
90-
images, err := cli.ImageList(ctx, types.ImageListOptions{
90+
images, err := cli.ImageList(ctx, image.ListOptions{
9191
Filters: filters.NewArgs(filters.Arg("reference", imageName)),
9292
})
9393
if err != nil {
@@ -101,7 +101,7 @@ func isDockerImageAvailable(ctx context.Context, imageName string) (bool, error)
101101
func pullDockerImage(ctx context.Context, imageName string, authToken string, teamName string, dockerHubAuth string) error {
102102
// Pull the image
103103
additionalHeaders := make(map[string]string)
104-
opts := types.ImagePullOptions{}
104+
opts := image.PullOptions{}
105105
if strings.HasPrefix(imageName, "docker.cloudquery.io") {
106106
if authToken == "" {
107107
return ErrLoginRequired

‎managedplugin/plugin.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
pbDiscovery "github.com/cloudquery/plugin-pb-go/pb/discovery/v0"
2222
pbDiscoveryV1 "github.com/cloudquery/plugin-pb-go/pb/discovery/v1"
2323
pbSource "github.com/cloudquery/plugin-pb-go/pb/source/v0"
24-
"github.com/docker/docker/api/types"
2524
"github.com/docker/docker/api/types/container"
2625
"github.com/docker/docker/api/types/network"
2726
dockerClient "github.com/docker/docker/client"
@@ -301,7 +300,7 @@ func (c *Client) startDockerPlugin(ctx context.Context, configPath string) error
301300
return fmt.Errorf("failed to create container: %w", err)
302301
}
303302
c.containerID = resp.ID
304-
if err := cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil {
303+
if err := cli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
305304
return fmt.Errorf("failed to start container: %w", err)
306305
}
307306
// wait for container to start
@@ -328,7 +327,7 @@ func (c *Client) startDockerPlugin(ctx context.Context, configPath string) error
328327
if err != nil {
329328
return fmt.Errorf("failed to get host connection: %w", err)
330329
}
331-
reader, err := cli.ContainerLogs(ctx, resp.ID, types.ContainerLogsOptions{
330+
reader, err := cli.ContainerLogs(ctx, resp.ID, container.LogsOptions{
332331
ShowStdout: true,
333332
ShowStderr: true,
334333
Follow: true,
@@ -648,7 +647,7 @@ func (c *Client) Terminate() error {
648647
if err := cli.ContainerStop(context.Background(), c.containerID, container.StopOptions{Timeout: &timeout}); err != nil {
649648
return fmt.Errorf("failed to stop container: %w", err)
650649
}
651-
if err := cli.ContainerRemove(context.Background(), c.containerID, types.ContainerRemoveOptions{}); err != nil {
650+
if err := cli.ContainerRemove(context.Background(), c.containerID, container.RemoveOptions{}); err != nil {
652651
return fmt.Errorf("failed to remove container: %w", err)
653652
}
654653
}

0 commit comments

Comments
 (0)