Skip to content

Commit acb3639

Browse files
authored
Merge pull request #459 from mtrmac/moby
Update `docker/docker` (→ `moby/moby`) and `docker/cli` to v29.0.0
2 parents 36964d1 + 1fdbcec commit acb3639

File tree

768 files changed

+27343
-86624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

768 files changed

+27343
-86624
lines changed

common/go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ require (
7171
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
7272
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
7373
github.com/distribution/reference v0.6.0 // indirect
74-
github.com/docker/cli v28.5.2+incompatible // indirect
74+
github.com/docker/cli v29.0.0+incompatible // indirect
7575
github.com/docker/docker v28.5.2+incompatible // indirect
7676
github.com/docker/docker-credential-helpers v0.9.4 // indirect
7777
github.com/docker/go-connections v0.6.0 // indirect
7878
github.com/felixge/httpsnoop v1.0.4 // indirect
79-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
79+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
8080
github.com/go-logr/logr v1.4.3 // indirect
8181
github.com/go-logr/stdr v1.2.2 // indirect
8282
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
@@ -120,20 +120,20 @@ require (
120120
github.com/vbauerster/mpb/v8 v8.11.2 // indirect
121121
github.com/vishvananda/netns v0.0.5 // indirect
122122
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
123-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
124-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
125-
go.opentelemetry.io/otel v1.36.0 // indirect
126-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
127-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
123+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
124+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
125+
go.opentelemetry.io/otel v1.38.0 // indirect
126+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
127+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
128128
go.yaml.in/yaml/v2 v2.4.2 // indirect
129129
go.yaml.in/yaml/v3 v3.0.4 // indirect
130130
golang.org/x/mod v0.28.0 // indirect
131-
golang.org/x/net v0.45.0 // indirect
131+
golang.org/x/net v0.46.0 // indirect
132132
golang.org/x/text v0.30.0 // indirect
133133
golang.org/x/tools v0.37.0 // indirect
134-
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e // indirect
135-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
136-
google.golang.org/grpc v1.72.2 // indirect
134+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
135+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
136+
google.golang.org/grpc v1.75.0 // indirect
137137
google.golang.org/protobuf v1.36.9 // indirect
138138
gopkg.in/yaml.v3 v3.0.1 // indirect
139139
)

common/go.sum

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ github.com/disiqueira/gotree/v3 v3.0.2 h1:ik5iuLQQoufZBNPY518dXhiO5056hyNBIK9lWh
7272
github.com/disiqueira/gotree/v3 v3.0.2/go.mod h1:ZuyjE4+mUQZlbpkI24AmruZKhg3VHEgPLDY8Qk+uUu8=
7373
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
7474
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
75-
github.com/docker/cli v28.5.2+incompatible h1:XmG99IHcBmIAoC1PPg9eLBZPlTrNUAijsHLm8PjhBlg=
76-
github.com/docker/cli v28.5.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
75+
github.com/docker/cli v29.0.0+incompatible h1:KgsN2RUFMNM8wChxryicn4p46BdQWpXOA1XLGBGPGAw=
76+
github.com/docker/cli v29.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
7777
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
7878
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
7979
github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=
@@ -96,8 +96,8 @@ github.com/gkampitakis/go-diff v1.3.2 h1:Qyn0J9XJSDTgnsgHRdz9Zp24RaJeKMUHg2+PDZZ
9696
github.com/gkampitakis/go-diff v1.3.2/go.mod h1:LLgOrpqleQe26cte8s36HTWcTmMEur6OPYerdAAS9tk=
9797
github.com/gkampitakis/go-snaps v0.5.15 h1:amyJrvM1D33cPHwVrjo9jQxX8g/7E2wYdZ+01KS3zGE=
9898
github.com/gkampitakis/go-snaps v0.5.15/go.mod h1:HNpx/9GoKisdhw9AFOBT1N7DBs9DiHo/hGheFGBZ+mc=
99-
github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
100-
github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
99+
github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
100+
github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
101101
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
102102
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
103103
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -231,8 +231,8 @@ github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA
231231
github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
232232
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
233233
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
234-
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
235-
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
234+
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
235+
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
236236
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
237237
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=
238238
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
@@ -301,24 +301,24 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ
301301
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
302302
go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
303303
go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
304-
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
305-
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
306-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
307-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
308-
go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
309-
go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
304+
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
305+
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
306+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
307+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
308+
go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
309+
go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
310310
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 h1:1fTNlAIJZGWLP5FVu0fikVry1IsiUnXjf7QFvoNN3Xw=
311311
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0/go.mod h1:zjPK58DtkqQFn+YUMbx0M2XV3QgKU0gS9LeGohREyK4=
312312
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 h1:xJ2qHD0C1BeYVTLLR9sX12+Qb95kfeD/byKj6Ky1pXg=
313313
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0/go.mod h1:u5BF1xyjstDowA1R5QAO9JHzqK+ublenEW/dyqTjBVk=
314-
go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
315-
go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
316-
go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
317-
go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
318-
go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
319-
go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
320-
go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
321-
go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
314+
go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
315+
go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
316+
go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
317+
go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
318+
go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
319+
go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
320+
go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
321+
go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
322322
go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
323323
go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
324324
go.podman.io/image/v5 v5.38.0 h1:aUKrCANkPvze1bnhLJsaubcfz0d9v/bSDLnwsXJm6G4=
@@ -352,8 +352,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
352352
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
353353
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
354354
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
355-
golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=
356-
golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
355+
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
356+
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
357357
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
358358
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
359359
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -415,12 +415,14 @@ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxb
415415
golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
416416
golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
417417
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
418-
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e h1:UdXH7Kzbj+Vzastr5nVfccbmFsmYNygVLSPk1pEfDoY=
419-
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e/go.mod h1:085qFyf2+XaZlRdCgKNCIZ3afY2p4HHZdoIRpId8F4A=
420-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e h1:ztQaXfzEXTmCBvbtWYRhJxW+0iJcz2qXfd38/e9l7bA=
421-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
422-
google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
423-
google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
418+
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
419+
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
420+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 h1:BIRfGDEjiHRrk0QKZe3Xv2ieMhtgRGeLcZQ0mIVn4EY=
421+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE=
422+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 h1:eaY8u2EuxbRv7c3NiGK0/NedzVsCcV6hDuU5qPX5EGE=
423+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.mod h1:M4/wBTSeyLxupu3W3tJtOgB14jILAS/XWPSSa3TAlJc=
424+
google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4=
425+
google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
424426
google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
425427
google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
426428
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

image/docker/daemon/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"path/filepath"
66
"time"
77

8-
dockerclient "github.com/docker/docker/client"
98
"github.com/docker/go-connections/tlsconfig"
9+
dockerclient "github.com/moby/moby/client"
1010
"go.podman.io/image/v5/types"
1111
)
1212

@@ -60,7 +60,7 @@ func newDockerClient(sys *types.SystemContext) (*dockerclient.Client, error) {
6060
opts = append(opts, dockerclient.WithHTTPClient(hc))
6161
}
6262

63-
return dockerclient.NewClientWithOpts(opts...)
63+
return dockerclient.New(opts...)
6464
}
6565

6666
func tlsConfig(sys *types.SystemContext) (*http.Client, error) {

image/docker/daemon/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"path/filepath"
77
"testing"
88

9-
dockerclient "github.com/docker/docker/client"
9+
dockerclient "github.com/moby/moby/client"
1010
"github.com/stretchr/testify/assert"
1111
"go.podman.io/image/v5/types"
1212
)

image/docker/daemon/daemon_dest.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"io"
99

10-
"github.com/docker/docker/client"
10+
"github.com/moby/moby/client"
1111
"github.com/sirupsen/logrus"
1212
"go.podman.io/image/v5/docker/internal/tarfile"
1313
"go.podman.io/image/v5/docker/reference"
@@ -89,11 +89,11 @@ func imageLoadGoroutine(ctx context.Context, c *client.Client, reader *io.PipeRe
8989

9090
// imageLoad accepts tar stream on reader and sends it to c
9191
func imageLoad(ctx context.Context, c *client.Client, reader *io.PipeReader) error {
92-
resp, err := c.ImageLoad(ctx, reader, client.ImageLoadWithQuiet(true))
92+
res, err := c.ImageLoad(ctx, reader, client.ImageLoadWithQuiet(true))
9393
if err != nil {
9494
return fmt.Errorf("starting a load operation in docker engine: %w", err)
9595
}
96-
defer resp.Body.Close()
96+
defer res.Close()
9797

9898
// jsonError and jsonMessage are small subsets of docker/docker/pkg/jsonmessage.JSONError and JSONMessage,
9999
// copied here to minimize dependencies.
@@ -104,7 +104,7 @@ func imageLoad(ctx context.Context, c *client.Client, reader *io.PipeReader) err
104104
Error *jsonError `json:"errorDetail,omitempty"`
105105
}
106106

107-
dec := json.NewDecoder(resp.Body)
107+
dec := json.NewDecoder(res)
108108
for {
109109
var msg jsonMessage
110110
if err := dec.Decode(&msg); err != nil {

image/go.mod

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ require (
1212
github.com/containers/ocicrypt v1.2.1
1313
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467
1414
github.com/distribution/reference v0.6.0
15-
github.com/docker/cli v28.5.2+incompatible
15+
github.com/docker/cli v29.0.0+incompatible
1616
github.com/docker/distribution v2.8.3+incompatible
17-
github.com/docker/docker v28.5.2+incompatible
1817
github.com/docker/docker-credential-helpers v0.9.4
1918
github.com/docker/go-connections v0.6.0
2019
github.com/hashicorp/go-cleanhttp v0.5.2
@@ -23,6 +22,7 @@ require (
2322
github.com/klauspost/pgzip v1.2.6
2423
github.com/manifoldco/promptui v0.9.0
2524
github.com/mattn/go-sqlite3 v1.14.32
25+
github.com/moby/moby/client v0.1.0
2626
github.com/opencontainers/go-digest v1.0.0
2727
github.com/opencontainers/image-spec v1.1.1
2828
github.com/proglottis/gpgme v0.1.5
@@ -49,23 +49,18 @@ require (
4949
github.com/Microsoft/go-winio v0.6.2 // indirect
5050
github.com/VividCortex/ewma v1.2.0 // indirect
5151
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
52-
github.com/beorn7/perks v1.0.1 // indirect
53-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5452
github.com/chzyer/readline v1.5.1 // indirect
5553
github.com/clipperhouse/stringish v0.1.1 // indirect
5654
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
5755
github.com/containerd/errdefs v1.0.0 // indirect
5856
github.com/containerd/errdefs/pkg v0.3.0 // indirect
59-
github.com/containerd/log v0.1.0 // indirect
6057
github.com/containerd/stargz-snapshotter/estargz v0.18.1 // indirect
6158
github.com/coreos/go-oidc/v3 v3.14.1 // indirect
6259
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
6360
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
64-
github.com/docker/go-metrics v0.0.1 // indirect
6561
github.com/docker/go-units v0.5.0 // indirect
66-
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
6762
github.com/felixge/httpsnoop v1.0.4 // indirect
68-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
63+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
6964
github.com/go-logr/logr v1.4.3 // indirect
7065
github.com/go-logr/stdr v1.2.2 // indirect
7166
github.com/golang/protobuf v1.5.4 // indirect
@@ -79,22 +74,15 @@ require (
7974
github.com/miekg/pkcs11 v1.1.1 // indirect
8075
github.com/mistifyio/go-zfs/v3 v3.1.0 // indirect
8176
github.com/moby/docker-image-spec v1.3.1 // indirect
77+
github.com/moby/moby/api v1.52.0 // indirect
8278
github.com/moby/sys/capability v0.4.0 // indirect
8379
github.com/moby/sys/mountinfo v0.7.2 // indirect
84-
github.com/moby/sys/sequential v0.6.0 // indirect
8580
github.com/moby/sys/user v0.4.0 // indirect
86-
github.com/moby/term v0.5.2 // indirect
8781
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8882
github.com/modern-go/reflect2 v1.0.2 // indirect
89-
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9083
github.com/opencontainers/runtime-spec v1.2.1 // indirect
9184
github.com/opencontainers/selinux v1.13.0 // indirect
92-
github.com/pkg/errors v0.9.1 // indirect
9385
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
94-
github.com/prometheus/client_golang v1.22.0 // indirect
95-
github.com/prometheus/client_model v0.6.2 // indirect
96-
github.com/prometheus/common v0.63.0 // indirect
97-
github.com/prometheus/procfs v0.15.1 // indirect
9886
github.com/segmentio/ksuid v1.0.4 // indirect
9987
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
10088
github.com/sigstore/protobuf-specs v0.4.1 // indirect
@@ -104,17 +92,16 @@ require (
10492
github.com/tchap/go-patricia/v2 v2.3.3 // indirect
10593
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
10694
github.com/vbatts/tar-split v0.12.2 // indirect
107-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
108-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
109-
go.opentelemetry.io/otel v1.36.0 // indirect
110-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
111-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
112-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
113-
golang.org/x/net v0.45.0 // indirect
95+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
96+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
97+
go.opentelemetry.io/otel v1.38.0 // indirect
98+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
99+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
100+
golang.org/x/net v0.46.0 // indirect
114101
golang.org/x/sys v0.38.0 // indirect
115102
golang.org/x/text v0.30.0 // indirect
116-
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e // indirect
117-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
118-
google.golang.org/grpc v1.72.2 // indirect
103+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
104+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
105+
google.golang.org/grpc v1.75.0 // indirect
119106
google.golang.org/protobuf v1.36.9 // indirect
120107
)

0 commit comments

Comments
 (0)