Skip to content

Commit e024ffc

Browse files
committed
vendor; docker/docker, moby/moby/api and moby/moby/client 0f9c087c91c0
Also revert docker/docker to the latest v28.3.3 release full diff: moby/moby@4faedf2...0f9c087 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent f86ad2e commit e024ffc

37 files changed

Lines changed: 262 additions & 149 deletions

e2e/testutils/plugins.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"testing"
1414

1515
"github.com/moby/moby/api/types"
16+
"github.com/moby/moby/api/types/plugin"
1617
"gotest.tools/v3/assert"
1718
"gotest.tools/v3/fs"
1819
"gotest.tools/v3/icmd"
@@ -32,7 +33,11 @@ func SetupPlugin(t *testing.T, ctx context.Context) *fs.Dir {
3233
},
3334
Interface: types.PluginConfigInterface{
3435
Socket: "basic.sock",
35-
Types: []types.PluginInterfaceType{{Capability: "docker.dummy/1.0"}},
36+
Types: []plugin.CapabilityID{{
37+
Capability: "dummy",
38+
Prefix: "docker",
39+
Version: "1.0",
40+
}},
3641
},
3742
Entrypoint: []string{"/basic"},
3843
}

vendor.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ go 1.23.0
88

99
replace (
1010
// FIXME(thaJeztah): temporarily need to pin on commits, otherwise go modules won't resolve until these are tagged.
11-
github.com/moby/moby/api => github.com/moby/moby/api v0.0.0-20250731152656-4faedf2bec36
12-
github.com/moby/moby/client => github.com/moby/moby/client v0.0.0-20250731152656-4faedf2bec36
11+
github.com/moby/moby/api => github.com/moby/moby/api v0.0.0-20250801223428-0f9c087c91c0
12+
github.com/moby/moby/client => github.com/moby/moby/client v0.0.0-20250801223428-0f9c087c91c0
1313
)
1414

1515
require (
@@ -22,7 +22,7 @@ require (
2222
github.com/distribution/reference v0.6.0
2323
github.com/docker/cli-docs-tool v0.10.0
2424
github.com/docker/distribution v2.8.3+incompatible
25-
github.com/docker/docker v28.2.3-0.20250731152656-4faedf2bec36+incompatible // master (v29.0-dev)
25+
github.com/docker/docker v28.3.3+incompatible
2626
github.com/docker/docker-credential-helpers v0.9.3
2727
github.com/docker/go-connections v0.5.0
2828
github.com/docker/go-units v0.5.0

vendor.sum

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ 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.2.3-0.20250731152656-4faedf2bec36+incompatible h1:V1yo9808DrQaHES6Q3hW5Rtd44+mrc4oKulmzPgRDAM=
61-
github.com/docker/docker v28.2.3-0.20250731152656-4faedf2bec36+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
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=
6262
github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
6363
github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
6464
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
@@ -172,10 +172,10 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
172172
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
173173
github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
174174
github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
175-
github.com/moby/moby/api v0.0.0-20250731152656-4faedf2bec36 h1:2o6bmPZvLOYqE6mQGqnyt+556TMpa26ZtSxvgSpT+98=
176-
github.com/moby/moby/api v0.0.0-20250731152656-4faedf2bec36/go.mod h1:GNQ0zU3WJGeJIcrLPE3xiQnsnLElvfqXQZZZiOqWuiE=
177-
github.com/moby/moby/client v0.0.0-20250731152656-4faedf2bec36 h1:o32ntpp76dDd5Hf9+XL09+qs06120KvZl+Ogt+RkYG0=
178-
github.com/moby/moby/client v0.0.0-20250731152656-4faedf2bec36/go.mod h1:+TFnycF6RuAUAq1tGTjZiSXuRcywpKUGo2dLkJ6tC48=
175+
github.com/moby/moby/api v0.0.0-20250801223428-0f9c087c91c0 h1:reuSLYQXfWqdHvnx0xtXLsCv2nJPN53Go4MHoTLimgo=
176+
github.com/moby/moby/api v0.0.0-20250801223428-0f9c087c91c0/go.mod h1:MuA35dxT3DVZpImg0ORGCoZtT2dC1jgPjwH9/CQ/afQ=
177+
github.com/moby/moby/client v0.0.0-20250801223428-0f9c087c91c0 h1:Niu3lfe7O5JCSZeNoFvDw/7wDNAEtGgtEWESO+A7O7E=
178+
github.com/moby/moby/client v0.0.0-20250801223428-0f9c087c91c0/go.mod h1:+TFnycF6RuAUAq1tGTjZiSXuRcywpKUGo2dLkJ6tC48=
179179
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
180180
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
181181
github.com/moby/swarmkit/v2 v2.0.0 h1:jkWQKQaJ4ltA61/mC9UdPe1McLma55RUcacTO+pPweY=
@@ -418,5 +418,7 @@ gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
418418
gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
419419
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
420420
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
421+
pgregory.net/rapid v1.2.0 h1:keKAYRcjm+e1F0oAuU5F5+YPAWcyxNNRK2wud503Gnk=
422+
pgregory.net/rapid v1.2.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
421423
tags.cncf.io/container-device-interface v0.8.0 h1:8bCFo/g9WODjWx3m6EYl3GfUG31eKJbaggyBDxEldRc=
422424
tags.cncf.io/container-device-interface v0.8.0/go.mod h1:Apb7N4VdILW0EVdEMRYXIDVRZfNJZ+kmEUss2kRRQ6Y=

vendor/github.com/docker/docker/pkg/process/process.go

Lines changed: 0 additions & 29 deletions
This file was deleted.

vendor/github.com/docker/docker/pkg/process/process_linux.go

Lines changed: 0 additions & 24 deletions
This file was deleted.

vendor/github.com/docker/docker/pkg/process/process_nolinux.go

Lines changed: 0 additions & 7 deletions
This file was deleted.

vendor/github.com/docker/docker/pkg/process/process_unix.go

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

vendor/github.com/docker/docker/pkg/process/process_windows.go

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

vendor/github.com/moby/moby/api/types/common/id_response.go

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

vendor/github.com/moby/moby/api/types/container/change_type.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.

0 commit comments

Comments
 (0)