Skip to content

Commit 5283199

Browse files
aaron-prindleaaron-prindle
authored
deps: bump github.com/moby/buildkit and github.com/docker/docker (#3242)
1 parent 38f1ad8 commit 5283199

File tree

331 files changed

+2335
-41638
lines changed

Some content is hidden

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

331 files changed

+2335
-41638
lines changed

Diff for: ‎go.mod

+4-9
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20240419161514-af205d85bb44
1313
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589
1414
github.com/containerd/cgroups v1.1.0 // indirect
15-
github.com/docker/docker v26.1.3+incompatible
15+
github.com/docker/docker v27.0.3+incompatible
1616
github.com/go-git/go-billy/v5 v5.5.0
1717
github.com/go-git/go-git/v5 v5.12.0
1818
github.com/golang/mock v1.6.0
@@ -22,7 +22,7 @@ require (
2222
github.com/google/slowjam v1.1.1
2323
github.com/karrick/godirwalk v1.16.1
2424
github.com/minio/highwayhash v1.0.2
25-
github.com/moby/buildkit v0.13.2
25+
github.com/moby/buildkit v0.14.1
2626
github.com/otiai10/copy v1.14.0
2727
github.com/pkg/errors v0.9.1
2828
github.com/sirupsen/logrus v1.9.3
@@ -74,13 +74,11 @@ require (
7474
github.com/aws/smithy-go v1.20.3 // indirect
7575
github.com/beorn7/perks v1.0.1 // indirect
7676
github.com/cespare/xxhash/v2 v2.2.0 // indirect
77-
github.com/cilium/ebpf v0.9.1 // indirect
7877
github.com/containerd/continuity v0.4.3 // indirect
7978
github.com/containerd/fifo v1.1.0 // indirect
8079
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
81-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
8280
github.com/dimchansky/utfbom v1.1.1 // indirect
83-
github.com/docker/cli v26.1.0+incompatible // indirect
81+
github.com/docker/cli v26.1.4+incompatible // indirect
8482
github.com/docker/distribution v2.8.2+incompatible // indirect
8583
github.com/docker/docker-credential-helpers v0.8.1 // indirect
8684
github.com/docker/go-connections v0.5.0 // indirect
@@ -90,7 +88,6 @@ require (
9088
github.com/ePirat/docker-credential-gitlabci v1.0.0
9189
github.com/emirpasic/gods v1.18.1 // indirect
9290
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
93-
github.com/godbus/dbus/v5 v5.1.0 // indirect
9491
github.com/gogo/protobuf v1.3.2 // indirect
9592
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
9693
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -129,7 +126,6 @@ require (
129126
github.com/xanzy/ssh-agent v0.3.3 // indirect
130127
go.etcd.io/etcd/raft/v3 v3.5.6 // indirect
131128
go.opencensus.io v0.24.0 // indirect
132-
go.uber.org/goleak v1.2.1 // indirect
133129
golang.org/x/crypto v0.24.0 // indirect
134130
golang.org/x/sys v0.21.0
135131
golang.org/x/text v0.16.0 // indirect
@@ -154,13 +150,12 @@ require (
154150
github.com/aws/aws-sdk-go-v2/service/ecr v1.27.4 // indirect
155151
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.23.4 // indirect
156152
github.com/cloudflare/circl v1.3.7 // indirect
157-
github.com/containerd/cgroups/v3 v3.0.2 // indirect
158153
github.com/containerd/errdefs v0.1.0 // indirect
159154
github.com/containerd/log v0.1.0 // indirect
160155
github.com/containerd/ttrpc v1.2.4 // indirect
161156
github.com/containerd/typeurl/v2 v2.1.1 // indirect
162157
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
163-
github.com/distribution/reference v0.5.0 // indirect
158+
github.com/distribution/reference v0.6.0 // indirect
164159
github.com/felixge/httpsnoop v1.0.4 // indirect
165160
github.com/fsnotify/fsnotify v1.7.0 // indirect
166161
github.com/go-logr/logr v1.4.1 // indirect

Diff for: ‎go.sum

+8-18
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj
134134
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
135135
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 h1:krfRl01rzPzxSxyLyrChD+U+MzsBXbm0OwYYB67uF+4=
136136
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589/go.mod h1:OuDyvmLnMCwa2ep4Jkm6nyA0ocJuZlGyk2gGseVzERM=
137-
github.com/cilium/ebpf v0.9.1 h1:64sn2K3UKw8NbP/blsixRpF3nXuyhz/VjRlRzvlBRu4=
138-
github.com/cilium/ebpf v0.9.1/go.mod h1:+OhNOIXx/Fnu1IE8bJz2dzOA+VSfyTfdNUVdlQnxUFY=
139137
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
140138
github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
141139
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
@@ -146,8 +144,6 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC
146144
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
147145
github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
148146
github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
149-
github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0=
150-
github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE=
151147
github.com/containerd/containerd v1.7.18 h1:jqjZTQNfXGoEaZdW1WwPU0RqSn1Bm2Ay/KJPUuO8nao=
152148
github.com/containerd/containerd v1.7.18/go.mod h1:IYEk9/IO6wAPUz2bCMVUbsfXjzw5UNP5fLz4PsUygQ4=
153149
github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=
@@ -165,8 +161,6 @@ github.com/containerd/ttrpc v1.2.4/go.mod h1:ojvb8SJBSch0XkqNO0L0YX/5NxR3UnVk2Lz
165161
github.com/containerd/typeurl/v2 v2.1.1 h1:3Q4Pt7i8nYwy2KmQWIw2+1hTvwTE/6w9FqcttATPO/4=
166162
github.com/containerd/typeurl/v2 v2.1.1/go.mod h1:IDp2JFvbwZ31H8dQbEIY7sDl2L3o3HZj1hsSQlywkQ0=
167163
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
168-
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
169-
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
170164
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
171165
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
172166
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@@ -178,16 +172,16 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
178172
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
179173
github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
180174
github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
181-
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
182-
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
175+
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
176+
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
183177
github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
184178
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
185-
github.com/docker/cli v26.1.0+incompatible h1:+nwRy8Ocd8cYNQ60mozDDICICD8aoFGtlPXifX/UQ3Y=
186-
github.com/docker/cli v26.1.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
179+
github.com/docker/cli v26.1.4+incompatible h1:I8PHdc0MtxEADqYJZvhBrW9bo8gawKwwenxRM7/rLu8=
180+
github.com/docker/cli v26.1.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
187181
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
188182
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
189-
github.com/docker/docker v26.1.3+incompatible h1:lLCzRbrVZrljpVNobJu1J2FHk8V0s4BawoZippkc+xo=
190-
github.com/docker/docker v26.1.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
183+
github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE=
184+
github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
191185
github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo=
192186
github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
193187
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -235,8 +229,6 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
235229
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
236230
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
237231
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
238-
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
239-
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
240232
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
241233
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
242234
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -356,8 +348,8 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG
356348
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
357349
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
358350
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
359-
github.com/moby/buildkit v0.13.2 h1:nXNszM4qD9E7QtG7bFWPnDI1teUQFQglBzon/IU3SzI=
360-
github.com/moby/buildkit v0.13.2/go.mod h1:2cyVOv9NoHM7arphK9ZfHIWKn9YVZRFd1wXB8kKmEzY=
351+
github.com/moby/buildkit v0.14.1 h1:2epLCZTkn4CikdImtsLtIa++7DzCimrrZCT1sway+oI=
352+
github.com/moby/buildkit v0.14.1/go.mod h1:1XssG7cAqv5Bz1xcGMxJL123iCv5TYN4Z/qf647gfuk=
361353
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
362354
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
363355
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
@@ -513,8 +505,6 @@ go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw
513505
go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
514506
go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
515507
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
516-
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
517-
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
518508
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
519509
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
520510
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=

Diff for: ‎pkg/dockerfile/dockerfile.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"github.com/GoogleContainerTools/kaniko/pkg/config"
3333
"github.com/GoogleContainerTools/kaniko/pkg/util"
3434
"github.com/moby/buildkit/frontend/dockerfile/instructions"
35+
"github.com/moby/buildkit/frontend/dockerfile/linter"
3536
"github.com/moby/buildkit/frontend/dockerfile/parser"
3637
"github.com/pkg/errors"
3738
)
@@ -90,7 +91,7 @@ func Parse(b []byte) ([]instructions.Stage, []instructions.ArgCommand, error) {
9091
if err != nil {
9192
return nil, nil, err
9293
}
93-
stages, metaArgs, err := instructions.Parse(p.AST)
94+
stages, metaArgs, err := instructions.Parse(p.AST, &linter.Linter{})
9495
if err != nil {
9596
return nil, nil, err
9697
}

Diff for: ‎pkg/image/image_util_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
v1 "github.com/google/go-containerregistry/pkg/v1"
2424
"github.com/google/go-containerregistry/pkg/v1/empty"
2525
"github.com/moby/buildkit/frontend/dockerfile/instructions"
26+
"github.com/moby/buildkit/frontend/dockerfile/linter"
2627
"github.com/moby/buildkit/frontend/dockerfile/parser"
2728

2829
"github.com/GoogleContainerTools/kaniko/pkg/config"
@@ -117,7 +118,7 @@ func parse(s string) ([]instructions.Stage, error) {
117118
if err != nil {
118119
return nil, err
119120
}
120-
stages, _, err := instructions.Parse(p.AST)
121+
stages, _, err := instructions.Parse(p.AST, &linter.Linter{})
121122
if err != nil {
122123
return nil, err
123124
}

Diff for: ‎pkg/util/command_util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func ResolveEnvironmentReplacementList(values, envs []string, isFilepath bool) (
7070
// "a\"b" -> "a"b"
7171
func ResolveEnvironmentReplacement(value string, envs []string, isFilepath bool) (string, error) {
7272
shlex := shell.NewLex(parser.DefaultEscapeToken)
73-
fp, err := shlex.ProcessWord(value, envs)
73+
fp, _, err := shlex.ProcessWord(value, envs)
7474
// Check after replacement if value is a remote URL
7575
if !isFilepath || IsSrcRemoteFileURL(fp) {
7676
return fp, err

Diff for: ‎vendor/github.com/cilium/ebpf/.clang-format

-17
This file was deleted.

Diff for: ‎vendor/github.com/cilium/ebpf/.gitignore

-14
This file was deleted.

Diff for: ‎vendor/github.com/cilium/ebpf/.golangci.yaml

-28
This file was deleted.

Diff for: ‎vendor/github.com/cilium/ebpf/ARCHITECTURE.md

-86
This file was deleted.

0 commit comments

Comments
 (0)