Skip to content

Commit 1787c36

Browse files
tonistiigitonistiigi
committed
vendor: update buildkit to v0.15.0-rc1
Signed-off-by: Tonis Tiigi <[email protected]>
1 parent c4dcaa0 commit 1787c36

264 files changed

Lines changed: 26406 additions & 4119 deletions

File tree

Some content is hidden

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

‎builder/builder-next/controller.go‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,22 @@ func newSnapshotterController(ctx context.Context, rt http.RoundTripper, opt Opt
109109

110110
dns := getDNSConfig(opt.DNSConfig)
111111

112-
wo, err := containerd.NewWorkerOpt(opt.Root, opt.ContainerdAddress, opt.Snapshotter, opt.ContainerdNamespace,
113-
opt.Rootless, map[string]string{
112+
workerOpts := containerd.WorkerOptions{
113+
Root: opt.Root,
114+
Address: opt.ContainerdAddress,
115+
SnapshotterName: opt.Snapshotter,
116+
Namespace: opt.ContainerdNamespace,
117+
Rootless: opt.Rootless,
118+
Labels: map[string]string{
114119
label.Snapshotter: opt.Snapshotter,
115-
}, dns, nc, opt.ApparmorProfile, false, nil, "", nil, ctd.WithTimeout(60*time.Second),
116-
)
120+
},
121+
DNS: dns,
122+
NetworkOpt: nc,
123+
ApparmorProfile: opt.ApparmorProfile,
124+
Selinux: false,
125+
}
126+
127+
wo, err := containerd.NewWorkerOpt(workerOpts, ctd.WithTimeout(60*time.Second))
117128
if err != nil {
118129
return nil, err
119130
}

‎builder/dockerfile/builder.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func emitImageID(aux *streamformatter.AuxFormatter, state *dispatchState) error
228228

229229
func processMetaArg(meta instructions.ArgCommand, shlex *shell.Lex, args *BuildArgs) error {
230230
// shell.Lex currently only support the concatenated string format
231-
envs := convertMapToEnvList(args.GetAllAllowed())
231+
envs := shell.EnvsFromSlice(convertMapToEnvList(args.GetAllAllowed()))
232232
if err := meta.Expand(func(word string) (string, error) {
233233
newword, _, err := shlex.ProcessWord(word, envs)
234234
return newword, err

‎builder/dockerfile/dispatchers.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ func (d *dispatchRequest) getExpandedString(shlex *shell.Lex, str string) (strin
224224
substitutionArgs = append(substitutionArgs, key+"="+value)
225225
}
226226

227-
name, _, err := shlex.ProcessWord(str, substitutionArgs)
227+
name, _, err := shlex.ProcessWord(str, shell.EnvsFromSlice(substitutionArgs))
228228
if err != nil {
229229
return "", err
230230
}
@@ -508,7 +508,7 @@ func dispatchEntrypoint(ctx context.Context, d dispatchRequest, c *instructions.
508508
//
509509
// Expose ports for links and port mappings. This all ends up in
510510
// req.runConfig.ExposedPorts for runconfig.
511-
func dispatchExpose(ctx context.Context, d dispatchRequest, c *instructions.ExposeCommand, envs []string) error {
511+
func dispatchExpose(ctx context.Context, d dispatchRequest, c *instructions.ExposeCommand, envs shell.EnvGetter) error {
512512
// custom multi word expansion
513513
// expose $FOO with FOO="80 443" is expanded as EXPOSE [80,443]. This is the only command supporting word to words expansion
514514
// so the word processing has been de-generalized

‎builder/dockerfile/evaluator.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func dispatch(ctx context.Context, d dispatchRequest, cmd instructions.Command)
4343
}
4444
}
4545
runConfigEnv := d.state.runConfig.Env
46-
envs := append(runConfigEnv, d.state.buildArgs.FilterAllowed(runConfigEnv)...)
46+
envs := shell.EnvsFromSlice(append(runConfigEnv, d.state.buildArgs.FilterAllowed(runConfigEnv)...))
4747

4848
if ex, ok := cmd.(instructions.SupportsSingleWordExpansion); ok {
4949
err := ex.Expand(func(word string) (string, error) {

‎vendor.mod‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
module github.com/docker/docker
66

7-
go 1.21
7+
go 1.21.0
88

99
require (
1010
cloud.google.com/go/compute/metadata v0.2.3
@@ -62,7 +62,7 @@ require (
6262
github.com/miekg/dns v1.1.57
6363
github.com/mistifyio/go-zfs/v3 v3.0.1
6464
github.com/mitchellh/copystructure v1.2.0
65-
github.com/moby/buildkit v0.14.1
65+
github.com/moby/buildkit v0.15.0-rc1
6666
github.com/moby/docker-image-spec v1.3.1
6767
github.com/moby/ipvs v1.1.0
6868
github.com/moby/locker v1.0.1
@@ -104,7 +104,7 @@ require (
104104
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
105105
golang.org/x/mod v0.17.0
106106
golang.org/x/net v0.25.0
107-
golang.org/x/sync v0.5.0
107+
golang.org/x/sync v0.7.0
108108
golang.org/x/sys v0.21.0
109109
golang.org/x/text v0.15.0
110110
golang.org/x/time v0.3.0
@@ -143,12 +143,12 @@ require (
143143
github.com/container-storage-interface/spec v1.5.0 // indirect
144144
github.com/containerd/cgroups v1.1.0 // indirect
145145
github.com/containerd/console v1.0.4 // indirect
146-
github.com/containerd/go-cni v1.1.9 // indirect
146+
github.com/containerd/go-cni v1.1.10 // indirect
147147
github.com/containerd/go-runc v1.1.0 // indirect
148148
github.com/containerd/nydus-snapshotter v0.13.7 // indirect
149149
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
150150
github.com/containerd/ttrpc v1.2.5 // indirect
151-
github.com/containernetworking/cni v1.1.2 // indirect
151+
github.com/containernetworking/cni v1.2.2 // indirect
152152
github.com/containernetworking/plugins v1.4.0 // indirect
153153
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
154154
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -157,9 +157,9 @@ require (
157157
github.com/felixge/httpsnoop v1.0.4 // indirect
158158
github.com/fernet/fernet-go v0.0.0-20211208181803-9f70042a33ee // indirect
159159
github.com/fsnotify/fsnotify v1.6.0 // indirect
160-
github.com/go-logr/logr v1.3.0 // indirect
160+
github.com/go-logr/logr v1.4.1 // indirect
161161
github.com/go-logr/stdr v1.2.2 // indirect
162-
github.com/gofrs/flock v0.8.1 // indirect
162+
github.com/gofrs/flock v0.12.0 // indirect
163163
github.com/gogo/googleapis v1.4.1 // indirect
164164
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
165165
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -172,9 +172,11 @@ require (
172172
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
173173
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
174174
github.com/hashicorp/errwrap v1.1.0 // indirect
175+
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
175176
github.com/hashicorp/go-msgpack v0.5.5 // indirect
176177
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
177178
github.com/hashicorp/golang-lru v0.5.4 // indirect
179+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
178180
github.com/in-toto/in-toto-golang v0.5.0 // indirect
179181
github.com/inconshreveable/mousetrap v1.1.0 // indirect
180182
github.com/jmoiron/sqlx v1.3.3 // indirect
@@ -187,15 +189,16 @@ require (
187189
github.com/pmezard/go-difflib v1.0.0 // indirect
188190
github.com/prometheus/client_model v0.5.0 // indirect
189191
github.com/prometheus/common v0.44.0 // indirect
190-
github.com/prometheus/procfs v0.12.0 // indirect
192+
github.com/prometheus/procfs v0.15.1 // indirect
191193
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
192194
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
193195
github.com/shibumi/go-pathspec v1.3.0 // indirect
194196
github.com/spdx/tools-golang v0.5.3 // indirect
195-
github.com/stretchr/testify v1.8.4 // indirect
197+
github.com/stretchr/testify v1.9.0 // indirect
196198
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
197199
github.com/tinylib/msgp v1.1.8 // indirect
198-
github.com/tonistiigi/go-actions-cache v0.0.0-20240320205438-9794bdbb2fb4 // indirect
200+
github.com/tonistiigi/go-actions-cache v0.0.0-20240327122527-58651d5e11d6 // indirect
201+
github.com/tonistiigi/go-csvvalue v0.0.0-20240619222358-bb8dd5cba3c2 // indirect
199202
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
200203
github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab // indirect
201204
github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b // indirect
@@ -220,7 +223,7 @@ require (
220223
go.uber.org/zap v1.21.0 // indirect
221224
golang.org/x/crypto v0.23.0 // indirect
222225
golang.org/x/oauth2 v0.11.0 // indirect
223-
golang.org/x/tools v0.16.0 // indirect
226+
golang.org/x/tools v0.21.0 // indirect
224227
google.golang.org/api v0.128.0 // indirect
225228
google.golang.org/appengine v1.6.8 // indirect
226229
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect

0 commit comments

Comments
 (0)