Skip to content

Commit c9b2da6

Browse files
authored
Merge pull request #3513 from jsternberg/vendor-buildkit
vendor: update buildkit v0.26.0-rc2
2 parents 606e9d1 + 1651da0 commit c9b2da6

File tree

10 files changed

+97
-53
lines changed

10 files changed

+97
-53
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ require (
88
github.com/aws/aws-sdk-go-v2/config v1.31.3
99
github.com/compose-spec/compose-go/v2 v2.9.1
1010
github.com/containerd/console v1.0.5
11-
github.com/containerd/containerd/v2 v2.2.0-rc.1
11+
github.com/containerd/containerd/v2 v2.2.0
1212
github.com/containerd/continuity v0.4.5
1313
github.com/containerd/errdefs v1.0.0
1414
github.com/containerd/log v0.1.0
15-
github.com/containerd/platforms v1.0.0-rc.1
15+
github.com/containerd/platforms v1.0.0-rc.2
1616
github.com/creack/pty v1.1.24
1717
github.com/davecgh/go-spew v1.1.1
1818
github.com/distribution/reference v0.6.0
@@ -29,7 +29,7 @@ require (
2929
github.com/hashicorp/hcl/v2 v2.24.0
3030
github.com/in-toto/in-toto-golang v0.9.0
3131
github.com/mitchellh/hashstructure/v2 v2.0.2
32-
github.com/moby/buildkit v0.26.0-rc1
32+
github.com/moby/buildkit v0.26.0-rc2
3333
github.com/moby/go-archive v0.1.0
3434
github.com/moby/sys/atomicwriter v0.1.0
3535
github.com/moby/sys/mountinfo v0.7.2
@@ -88,7 +88,7 @@ require (
8888
github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 // indirect
8989
github.com/aws/smithy-go v1.22.5 // indirect
9090
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
91-
github.com/containerd/containerd/api v1.10.0-rc.0 // indirect
91+
github.com/containerd/containerd/api v1.10.0 // indirect
9292
github.com/containerd/errdefs/pkg v0.3.0 // indirect
9393
github.com/containerd/ttrpc v1.2.7 // indirect
9494
github.com/containerd/typeurl/v2 v2.2.3 // indirect

go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ github.com/containerd/cgroups/v3 v3.1.0 h1:azxYVj+91ZgSnIBp2eI3k9y2iYQSR/ZQIgh9v
6868
github.com/containerd/cgroups/v3 v3.1.0/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
6969
github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/qqsc=
7070
github.com/containerd/console v1.0.5/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
71-
github.com/containerd/containerd/api v1.10.0-rc.0 h1:PEaPRT4atfXLlbr3HaZH/i7/2PZK/+sUnp210HkhXmY=
72-
github.com/containerd/containerd/api v1.10.0-rc.0/go.mod h1:GhghKFmTR3hNtyznBoQ0EMWr9ju5AqHjcZPsSpTKutI=
73-
github.com/containerd/containerd/v2 v2.2.0-rc.1 h1:806y9qsFiZkwl90DJhtAtedG43OcmGd57sJCFyvfxpo=
74-
github.com/containerd/containerd/v2 v2.2.0-rc.1/go.mod h1:X7H17UATRidzfNzb5vS/l30qEJk0ktoTEU1thMh0Nbk=
71+
github.com/containerd/containerd/api v1.10.0 h1:5n0oHYVBwN4VhoX9fFykCV9dF1/BvAXeg2F8W6UYq1o=
72+
github.com/containerd/containerd/api v1.10.0/go.mod h1:NBm1OAk8ZL+LG8R0ceObGxT5hbUYj7CzTmR3xh0DlMM=
73+
github.com/containerd/containerd/v2 v2.2.0 h1:K7TqcXy+LnFmZaui2DgHsnp2gAHhVNWYaHlx7HXfys8=
74+
github.com/containerd/containerd/v2 v2.2.0/go.mod h1:YCMjKjA4ZA7egdHNi3/93bJR1+2oniYlnS+c0N62HdE=
7575
github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
7676
github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
7777
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
@@ -84,8 +84,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
8484
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
8585
github.com/containerd/nydus-snapshotter v0.15.4 h1:l59kGRVMtwMLDLh322HsWhEsBCkRKMkGWYV5vBeLYCE=
8686
github.com/containerd/nydus-snapshotter v0.15.4/go.mod h1:eRJqnxQDr48HNop15kZdLZpFF5B6vf6Q11Aq1K0E4Ms=
87-
github.com/containerd/platforms v1.0.0-rc.1 h1:83KIq4yy1erSRgOVHNk1HYdPvzdJ5CnsWaRoJX4C41E=
88-
github.com/containerd/platforms v1.0.0-rc.1/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=
87+
github.com/containerd/platforms v1.0.0-rc.2 h1:0SPgaNZPVWGEi4grZdV8VRYQn78y+nm6acgLGv/QzE4=
88+
github.com/containerd/platforms v1.0.0-rc.2/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=
8989
github.com/containerd/plugin v1.0.0 h1:c8Kf1TNl6+e2TtMHZt+39yAPDbouRH9WAToRjex483Y=
9090
github.com/containerd/plugin v1.0.0/go.mod h1:hQfJe5nmWfImiqT1q8Si3jLv3ynMUIBB47bQ+KexvO8=
9191
github.com/containerd/stargz-snapshotter v0.17.0 h1:djNS4KU8ztFhLdEDZ1bsfzOiYuVHT6TgSU5qwRk+cNc=
@@ -252,8 +252,8 @@ github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTS
252252
github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
253253
github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
254254
github.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
255-
github.com/moby/buildkit v0.26.0-rc1 h1:gAroxWAvEcssyohcbCb82cK7BIbmqugFy9+93AQT1eo=
256-
github.com/moby/buildkit v0.26.0-rc1/go.mod h1:LiT7ohcE83rF/GtmoOBHj75+nUry+ili3FqZtlDkspo=
255+
github.com/moby/buildkit v0.26.0-rc2 h1:HLS1HtBlxdaz8NjHI5YAaN4c8NOPtUrIJ5jIq/b6tpI=
256+
github.com/moby/buildkit v0.26.0-rc2/go.mod h1:ylDa7IqzVJgLdi/wO7H1qLREFQpmhFbw2fbn4yoTw40=
257257
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
258258
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
259259
github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
@@ -395,8 +395,8 @@ github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea h1:SXhTLE6pb6eld/
395395
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea/go.mod h1:WPnis/6cRcDZSUvVmezrxJPkiO87ThFYsoUiMwWNDJk=
396396
github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab h1:H6aJ0yKQ0gF49Qb2z5hI1UHxSQt4JMyxebFR15KnApw=
397397
github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab/go.mod h1:ulncasL3N9uLrVann0m+CDlJKWsIAP34MPcOJF6VRvc=
398-
github.com/vbatts/tar-split v0.12.1 h1:CqKoORW7BUWBe7UL/iqTVvkTBOF8UvOMKOIZykxnnbo=
399-
github.com/vbatts/tar-split v0.12.1/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=
398+
github.com/vbatts/tar-split v0.12.2 h1:w/Y6tjxpeiFMR47yzZPlPj/FcPLpXbTUi/9H7d3CPa4=
399+
github.com/vbatts/tar-split v0.12.2/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=
400400
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
401401
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
402402
github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=

vendor/github.com/containerd/containerd/v2/defaults/defaults_darwin.go

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

vendor/github.com/containerd/containerd/v2/defaults/defaults_unix_nolinux.go renamed to vendor/github.com/containerd/containerd/v2/defaults/defaults_unix_other.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/containerd/containerd/v2/version/version.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/containerd/platforms/defaults_windows.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/containerd/platforms/platform_windows_compat.go

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

vendor/github.com/moby/buildkit/solver/pb/attr.go

Lines changed: 5 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/buildkit/solver/pb/caps.go

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

vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ github.com/compose-spec/compose-go/v2/validation
142142
# github.com/containerd/console v1.0.5
143143
## explicit; go 1.13
144144
github.com/containerd/console
145-
# github.com/containerd/containerd/api v1.10.0-rc.0
145+
# github.com/containerd/containerd/api v1.10.0
146146
## explicit; go 1.23.0
147147
github.com/containerd/containerd/api/services/content/v1
148-
# github.com/containerd/containerd/v2 v2.2.0-rc.1
148+
# github.com/containerd/containerd/v2 v2.2.0
149149
## explicit; go 1.24.3
150150
github.com/containerd/containerd/v2/core/content
151151
github.com/containerd/containerd/v2/core/content/proxy
@@ -198,7 +198,7 @@ github.com/containerd/errdefs/pkg/internal/types
198198
# github.com/containerd/log v0.1.0
199199
## explicit; go 1.20
200200
github.com/containerd/log
201-
# github.com/containerd/platforms v1.0.0-rc.1
201+
# github.com/containerd/platforms v1.0.0-rc.2
202202
## explicit; go 1.20
203203
github.com/containerd/platforms
204204
# github.com/containerd/ttrpc v1.2.7
@@ -443,7 +443,7 @@ github.com/mitchellh/go-wordwrap
443443
# github.com/mitchellh/hashstructure/v2 v2.0.2
444444
## explicit; go 1.14
445445
github.com/mitchellh/hashstructure/v2
446-
# github.com/moby/buildkit v0.26.0-rc1
446+
# github.com/moby/buildkit v0.26.0-rc2
447447
## explicit; go 1.24.3
448448
github.com/moby/buildkit/api/services/control
449449
github.com/moby/buildkit/api/types

0 commit comments

Comments
 (0)