Skip to content

Commit cc2aa7e

Browse files
committed
[28.x] vendor github.com/docker/docker v28.5.0-dev
update to latest API version Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 1a7fb31 commit cc2aa7e

File tree

260 files changed

+10248
-1703
lines changed

Some content is hidden

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

260 files changed

+10248
-1703
lines changed

cli/command/container/opts_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ func TestParseLabelfileVariables(t *testing.T) {
10171017
func TestParseEntryPoint(t *testing.T) {
10181018
config, _, _, err := parseRun([]string{"--entrypoint=anything", "cmd", "img"})
10191019
assert.NilError(t, err)
1020-
assert.Check(t, is.DeepEqual([]string(config.Entrypoint), []string{"anything"}))
1020+
assert.Check(t, is.DeepEqual(config.Entrypoint, []string{"anything"}))
10211021
}
10221022

10231023
func TestValidateDevice(t *testing.T) {

vendor.mod

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ module github.com/docker/cli
66

77
go 1.23.0
88

9+
replace (
10+
// FIXME(thaJeztah): trying https://github.com/moby/moby/pull/50475
11+
github.com/docker/docker => github.com/thaJeztah/docker v24.0.0-rc.1.0.20250821102143-9382f0e13085+incompatible
12+
13+
// FIXME(thaJeztah): temporarily need to pin on commits, otherwise go modules won't resolve until these are tagged.
14+
github.com/moby/moby/api => github.com/moby/moby/api v1.52.0-alpha.1.0.20250820163354-c8c4996ebfdf // master
15+
github.com/moby/moby/client => github.com/moby/moby/client v0.1.0-alpha.0.0.20250820163354-c8c4996ebfdf // master
16+
)
17+
918
require (
1019
dario.cat/mergo v1.0.1
1120
github.com/containerd/errdefs v1.0.0
@@ -85,6 +94,8 @@ require (
8594
github.com/klauspost/compress v1.18.0 // indirect
8695
github.com/miekg/pkcs11 v1.1.1 // indirect
8796
github.com/moby/docker-image-spec v1.3.1 // indirect
97+
github.com/moby/moby/api v1.52.0-alpha.1 // indirect
98+
github.com/moby/moby/client v0.0.0-00010101000000-000000000000 // indirect
8899
github.com/moby/sys/user v0.4.0 // indirect
89100
github.com/moby/sys/userns v0.1.0 // indirect
90101
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect

vendor.sum

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ github.com/docker/cli-docs-tool v0.10.0/go.mod h1:5EM5zPnT2E7yCLERZmrDA234Vwn09f
5757
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
5858
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
5959
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
60-
github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
61-
github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
6260
github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
6361
github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
6462
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
@@ -172,6 +170,10 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
172170
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
173171
github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
174172
github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
173+
github.com/moby/moby/api v1.52.0-alpha.1.0.20250820163354-c8c4996ebfdf h1:XeF0zzinsXSRWFFLt49coRV8xa5dUb920dewMNGGrtg=
174+
github.com/moby/moby/api v1.52.0-alpha.1.0.20250820163354-c8c4996ebfdf/go.mod h1:8sBV0soUREiudtow4vqJGOxa4GyHI5vLQmvgKdHq5Ok=
175+
github.com/moby/moby/client v0.1.0-alpha.0.0.20250820163354-c8c4996ebfdf h1:jAG3Ydt0zIp5USA9kHzQZNsVlBkaMLgam1/4OX+HERM=
176+
github.com/moby/moby/client v0.1.0-alpha.0.0.20250820163354-c8c4996ebfdf/go.mod h1:7pOYrEHdG7I0dNZEC+yqk/p8ZOxGMR1KgoexzCEDe0w=
175177
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
176178
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
177179
github.com/moby/swarmkit/v2 v2.0.0 h1:jkWQKQaJ4ltA61/mC9UdPe1McLma55RUcacTO+pPweY=
@@ -275,6 +277,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
275277
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
276278
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
277279
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
280+
github.com/thaJeztah/docker v24.0.0-rc.1.0.20250821102143-9382f0e13085+incompatible h1:66ofuDf0ykLSlQ5ojCcB7ohwWN5nWBbke2ZRsClnG/E=
281+
github.com/thaJeztah/docker v24.0.0-rc.1.0.20250821102143-9382f0e13085+incompatible/go.mod h1:eZ6Ef2GDr/8h8se23uenzFTrBHwc9jBEEnfrxqOb0Ss=
278282
github.com/theupdateframework/notary v0.7.1-0.20210315103452-bf96a202a09a h1:tlJ7tGUHvcvL1v3yR6NcCc9nOqh2L+CG6HWrYQtwzQ0=
279283
github.com/theupdateframework/notary v0.7.1-0.20210315103452-bf96a202a09a/go.mod h1:Y94A6rPp2OwNfP/7vmf8O2xx2IykP8pPXQ1DLouGnEw=
280284
github.com/tonistiigi/go-rosetta v0.0.0-20220804170347-3f4430f2d346 h1:TvtdmeYsYEij78hS4oxnwikoiLdIrgav3BA+CbhaDAI=
@@ -416,5 +420,7 @@ gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
416420
gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
417421
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
418422
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
423+
pgregory.net/rapid v1.2.0 h1:keKAYRcjm+e1F0oAuU5F5+YPAWcyxNNRK2wud503Gnk=
424+
pgregory.net/rapid v1.2.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
419425
tags.cncf.io/container-device-interface v0.8.0 h1:8bCFo/g9WODjWx3m6EYl3GfUG31eKJbaggyBDxEldRc=
420426
tags.cncf.io/container-device-interface v0.8.0/go.mod h1:Apb7N4VdILW0EVdEMRYXIDVRZfNJZ+kmEUss2kRRQ6Y=

vendor/github.com/docker/docker/api/swagger.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/api/types/aliases.go

Lines changed: 135 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/api/types/auxprogress/aliases.go

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/api/types/blkiodev/aliases.go

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/api/types/build/aliases.go

Lines changed: 38 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/api/types/build/disk_usage.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/api/types/checkpoint/aliases.go

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)