Skip to content

Commit cdd098e

Browse files
crazy-maxcrazy-max
authored
Merge pull request #1312 from crazy-max/update-buildkit
chore(deps): bump github.com/moby/buildkit to 0.17.3
2 parents 61dac9f + f0b4c3f commit cdd098e

Some content is hidden

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

44 files changed

+2286
-378
lines changed

‎go.mod

+6-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/matcornic/hermes/v2 v2.1.0
2828
github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16
2929
github.com/microcosm-cc/bluemonday v1.0.27
30-
github.com/moby/buildkit v0.13.2
30+
github.com/moby/buildkit v0.17.3
3131
github.com/nlopes/slack v0.6.0
3232
github.com/opencontainers/go-digest v1.0.0
3333
github.com/opencontainers/image-spec v1.1.0
@@ -86,7 +86,7 @@ require (
8686
github.com/golang/protobuf v1.5.4 // indirect
8787
github.com/google/gnostic-models v0.6.8 // indirect
8888
github.com/google/gofuzz v1.2.0 // indirect
89-
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
89+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
9090
github.com/google/uuid v1.6.0 // indirect
9191
github.com/gorilla/css v1.0.1 // indirect
9292
github.com/gorilla/mux v1.8.1 // indirect
@@ -119,10 +119,12 @@ require (
119119
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
120120
github.com/olekukonko/tablewriter v0.0.1 // indirect
121121
github.com/opencontainers/runtime-spec v1.2.0 // indirect
122+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
122123
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
123124
github.com/rivo/uniseg v0.4.7 // indirect
124125
github.com/spf13/pflag v1.0.5 // indirect
125126
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
127+
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 // indirect
126128
github.com/vanng822/css v0.0.0-20190504095207-a21e860bcd04 // indirect
127129
github.com/vanng822/go-premailer v0.0.0-20191214114701-be27abe028fe // indirect
128130
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
@@ -131,12 +133,12 @@ require (
131133
go.opentelemetry.io/otel/trace v1.28.0 // indirect
132134
golang.org/x/crypto v0.31.0 // indirect
133135
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
134-
golang.org/x/net v0.28.0 // indirect
136+
golang.org/x/net v0.29.0 // indirect
135137
golang.org/x/oauth2 v0.23.0 // indirect
136138
golang.org/x/sync v0.10.0 // indirect
137139
golang.org/x/term v0.27.0 // indirect
138140
golang.org/x/text v0.21.0 // indirect
139-
golang.org/x/time v0.3.0 // indirect
141+
golang.org/x/time v0.6.0 // indirect
140142
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
141143
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
142144
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect

‎go.sum

+13-9
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
138138
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
139139
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
140140
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
141-
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd h1:r8yyd+DJDmsUhGrRBxH5Pj7KeFK5l+Y3FsgT8keqKtk=
142-
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
141+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg=
142+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
143143
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
144144
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
145145
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -230,8 +230,8 @@ github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJ
230230
github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
231231
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
232232
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
233-
github.com/moby/buildkit v0.13.2 h1:nXNszM4qD9E7QtG7bFWPnDI1teUQFQglBzon/IU3SzI=
234-
github.com/moby/buildkit v0.13.2/go.mod h1:2cyVOv9NoHM7arphK9ZfHIWKn9YVZRFd1wXB8kKmEzY=
233+
github.com/moby/buildkit v0.17.3 h1:XN8ddC5gO1kGJJfi86kzvDlPOyLyPk66hTvswqhj6NQ=
234+
github.com/moby/buildkit v0.17.3/go.mod h1:vr5vltV8wt4F2jThbNOChfbAklJ0DOW11w36v210hOg=
235235
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
236236
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
237237
github.com/moby/sys/capability v0.3.0 h1:kEP+y6te0gEXIaeQhIi0s7vKs/w0RPoH1qPa6jROcVg=
@@ -272,6 +272,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
272272
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
273273
github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
274274
github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
275+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
276+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
275277
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
276278
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
277279
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -319,6 +321,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
319321
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
320322
github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
321323
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
324+
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 h1:7I5c2Ig/5FgqkYOh/N87NzoyI9U15qUPXhDD8uCupv8=
325+
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4/go.mod h1:278M4p8WsNh3n4a1eqiFcV2FGk7wE5fwUpUom9mK9lE=
322326
github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
323327
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
324328
github.com/vanng822/css v0.0.0-20190504095207-a21e860bcd04 h1:L0rPdfzq43+NV8rfIx2kA4iSSLRj2jN5ijYHoeXRwvQ=
@@ -377,8 +381,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
377381
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
378382
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
379383
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
380-
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
381-
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
384+
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
385+
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
382386
golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
383387
golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
384388
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -424,8 +428,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
424428
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
425429
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
426430
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
427-
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
428-
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
431+
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
432+
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
429433
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
430434
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
431435
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -438,7 +442,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
438442
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
439443
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
440444
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
441-
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b h1:+YaDE2r2OG8t/z5qmsh7Y+XXwCbvadxxZ0YY6mTdrVA=
445+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ=
442446
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8=
443447
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
444448
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=

‎pkg/dockerfile/client.go

+8-14
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
type Client struct {
1515
ast *parser.Node
1616
stages []instructions.Stage
17-
metaArgs []instructions.KeyValuePairOptional
17+
metaArgs shell.EnvGetter
1818
shlex *shell.Lex
1919
}
2020

@@ -35,26 +35,28 @@ func New(opts Options) (*Client, error) {
3535
return nil, errors.Wrapf(err, "cannot parse Dockerfile %s", opts.Filename)
3636
}
3737

38-
stages, metaArgs, err := instructions.Parse(parsed.AST)
38+
stages, metaArgs, err := instructions.Parse(parsed.AST, nil)
3939
if err != nil {
4040
return nil, errors.Wrapf(err, "cannot parse stages for Dockerfile %s", opts.Filename)
4141
}
4242

43-
var kvpoArgs []instructions.KeyValuePairOptional
43+
var kvpoArgs []string
4444
shlex := shell.NewLex(parsed.EscapeToken)
4545
for _, cmd := range metaArgs {
4646
for _, metaArg := range cmd.Args {
4747
if metaArg.Value != nil {
48-
*metaArg.Value, _ = shlex.ProcessWordWithMap(*metaArg.Value, metaArgsToMap(kvpoArgs))
48+
if name, _, err := shlex.ProcessWord(*metaArg.Value, shell.EnvsFromSlice(kvpoArgs)); err == nil {
49+
metaArg.Value = &name
50+
}
4951
}
50-
kvpoArgs = append(kvpoArgs, metaArg)
52+
kvpoArgs = append(kvpoArgs, metaArg.String())
5153
}
5254
}
5355

5456
return &Client{
5557
ast: parsed.AST,
5658
stages: stages,
57-
metaArgs: kvpoArgs,
59+
metaArgs: shell.EnvsFromSlice(kvpoArgs),
5860
shlex: shlex,
5961
}, nil
6062
}
@@ -67,11 +69,3 @@ func (c *Client) isStageName(name string) bool {
6769
}
6870
return false
6971
}
70-
71-
func metaArgsToMap(metaArgs []instructions.KeyValuePairOptional) map[string]string {
72-
m := map[string]string{}
73-
for _, arg := range metaArgs {
74-
m[arg.Key] = arg.ValueString()
75-
}
76-
return m
77-
}

‎pkg/dockerfile/image.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (c *Client) FromImages() (Images, error) {
3838
return nil, errors.Wrapf(err, "cannot parse instruction")
3939
}
4040
if baseName := ins.(*instructions.Stage).BaseName; baseName != "scratch" {
41-
name, err := c.shlex.ProcessWordWithMap(baseName, metaArgsToMap(c.metaArgs))
41+
name, _, err := c.shlex.ProcessWord(baseName, c.metaArgs)
4242
if err != nil {
4343
return nil, err
4444
}
@@ -59,7 +59,7 @@ func (c *Client) FromImages() (Images, error) {
5959
return nil, errors.Wrapf(err, "cannot parse command")
6060
}
6161
if copyFrom := cmd.(*instructions.CopyCommand).From; copyFrom != "null" {
62-
name, err := c.shlex.ProcessWordWithMap(copyFrom, metaArgsToMap(c.metaArgs))
62+
name, _, err := c.shlex.ProcessWord(copyFrom, c.metaArgs)
6363
if err != nil {
6464
return nil, err
6565
}
@@ -85,7 +85,7 @@ func (c *Client) FromImages() (Images, error) {
8585
if mount.Type != instructions.MountTypeBind || len(mount.From) == 0 {
8686
continue
8787
}
88-
name, err := c.shlex.ProcessWordWithMap(mount.From, metaArgsToMap(c.metaArgs))
88+
name, _, err := c.shlex.ProcessWord(mount.From, c.metaArgs)
8989
if err != nil {
9090
return nil, err
9191
}

‎vendor/github.com/google/pprof/profile/encode.go

+6-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/google/pprof/profile/legacy_java_profile.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/google/pprof/profile/merge.go

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/google/pprof/profile/profile.go

+11-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)