Skip to content

Commit b807ea8

Browse files
authored
Merge pull request #4868 from thaJeztah/update_engine
vendor: github.com/docker/docker 86b86412a1b7 (v26.0-dev)
2 parents 1cda2c4 + df6220d commit b807ea8

6 files changed

Lines changed: 212 additions & 6 deletions

File tree

vendor.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/creack/pty v1.1.21
1313
github.com/distribution/reference v0.5.0
1414
github.com/docker/distribution v2.8.3+incompatible
15-
github.com/docker/docker v25.0.1-0.20240207004304-9e075f3808a5+incompatible // master (v26.0.0-dev)
15+
github.com/docker/docker v25.0.1-0.20240209212242-86b86412a1b7+incompatible // master (v26.0.0-dev)
1616
github.com/docker/docker-credential-helpers v0.8.1
1717
github.com/docker/go-connections v0.5.0
1818
github.com/docker/go-units v0.5.0
@@ -65,6 +65,7 @@ require (
6565
github.com/klauspost/compress v1.17.4 // indirect
6666
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6767
github.com/miekg/pkcs11 v1.1.1 // indirect
68+
github.com/moby/docker-image-spec v1.3.1 // indirect
6869
github.com/moby/sys/symlink v0.2.0 // indirect
6970
github.com/moby/sys/user v0.1.0 // indirect
7071
github.com/prometheus/client_golang v1.14.0 // indirect

vendor.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5
5454
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
5555
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
5656
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
57-
github.com/docker/docker v25.0.1-0.20240207004304-9e075f3808a5+incompatible h1:L45ZCM6Y6gWhpPAMtfewHOXvW6a2QL8cTBoljMuUEHM=
58-
github.com/docker/docker v25.0.1-0.20240207004304-9e075f3808a5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
57+
github.com/docker/docker v25.0.1-0.20240209212242-86b86412a1b7+incompatible h1:86+mY7JmJekvP67j6fyDrjjlKuMnkgJMQr1gC7b0Bmc=
58+
github.com/docker/docker v25.0.1-0.20240209212242-86b86412a1b7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
5959
github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo=
6060
github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
6161
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
@@ -164,6 +164,8 @@ github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WT
164164
github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
165165
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
166166
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
167+
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
168+
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
167169
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
168170
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
169171
github.com/moby/swarmkit/v2 v2.0.0-20240125134710-dcda100a8261 h1:mjLf2jYrqtIS4LvLzg0gNyJR4rMXS4X5Bg1A4hOhVMs=

vendor/github.com/docker/docker/api/types/container/config.go

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

vendor/github.com/moby/docker-image-spec/LICENSE

Lines changed: 201 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/image/spec/specs-go/v1/image.go renamed to vendor/github.com/moby/docker-image-spec/specs-go/v1/image.go

File renamed without changes.

vendor/modules.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ github.com/docker/distribution/registry/client/transport
5353
github.com/docker/distribution/registry/storage/cache
5454
github.com/docker/distribution/registry/storage/cache/memory
5555
github.com/docker/distribution/uuid
56-
# github.com/docker/docker v25.0.1-0.20240207004304-9e075f3808a5+incompatible
56+
# github.com/docker/docker v25.0.1-0.20240209212242-86b86412a1b7+incompatible
5757
## explicit
5858
github.com/docker/docker/api
5959
github.com/docker/docker/api/types
@@ -77,7 +77,6 @@ github.com/docker/docker/builder/remotecontext/git
7777
github.com/docker/docker/builder/remotecontext/urlutil
7878
github.com/docker/docker/client
7979
github.com/docker/docker/errdefs
80-
github.com/docker/docker/image/spec/specs-go/v1
8180
github.com/docker/docker/internal/multierror
8281
github.com/docker/docker/pkg/archive
8382
github.com/docker/docker/pkg/homedir
@@ -180,6 +179,9 @@ github.com/miekg/pkcs11
180179
# github.com/mitchellh/mapstructure v1.5.0
181180
## explicit; go 1.14
182181
github.com/mitchellh/mapstructure
182+
# github.com/moby/docker-image-spec v1.3.1
183+
## explicit; go 1.18
184+
github.com/moby/docker-image-spec/specs-go/v1
183185
# github.com/moby/patternmatcher v0.6.0
184186
## explicit; go 1.19
185187
github.com/moby/patternmatcher

0 commit comments

Comments
 (0)