Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[20.10] vendor: github.com/moby/buildkit 3a1eeca59a9263613d996ead67d53a4b7d45723d (v0.8 branch) 

To align with docker v20.10.19

full diff: 8142d66b5e...3a1eeca59a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-10-17 21:10:14 +02:00
parent d85ef84533
commit 7d51e65e72
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
17 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -46,7 +46,7 @@ github.com/Microsoft/go-winio 5b44b70ab3ab4d291a7c1d28afe7
github.com/Microsoft/hcsshim 5bc557dd210ff2caf615e6e22d398123de77fc11 # v0.8.9 github.com/Microsoft/hcsshim 5bc557dd210ff2caf615e6e22d398123de77fc11 # v0.8.9
github.com/miekg/pkcs11 210dc1e16747c5ba98a03bcbcf728c38086ea357 # v1.0.3 github.com/miekg/pkcs11 210dc1e16747c5ba98a03bcbcf728c38086ea357 # v1.0.3
github.com/mitchellh/mapstructure d16e9488127408e67948eb43b6d3fbb9f222da10 # v1.3.2 github.com/mitchellh/mapstructure d16e9488127408e67948eb43b6d3fbb9f222da10 # v1.3.2
github.com/moby/buildkit 8142d66b5ebde79846b869fba30d9d30633e74aa # v0.8.1 github.com/moby/buildkit 3a1eeca59a9263613d996ead67d53a4b7d45723d # v0.8.3-29-g3a1eeca5
github.com/moby/sys 1bc8673b57550ddf85262eb0fed0aac651a37dab # symlink/v0.1.0 (latest tag, either mount/vXXX, mountinfo/vXXX or symlink/vXXX) github.com/moby/sys 1bc8673b57550ddf85262eb0fed0aac651a37dab # symlink/v0.1.0 (latest tag, either mount/vXXX, mountinfo/vXXX or symlink/vXXX)
github.com/moby/term 3f7ff695adc6a35abc925370dd0a4dafb48ec64d github.com/moby/term 3f7ff695adc6a35abc925370dd0a4dafb48ec64d
github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 # 1.0.3 github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 # 1.0.3

2
vendor/github.com/moby/buildkit/README.md generated vendored
View File

@ -189,7 +189,7 @@ buildctl build \
buildctl build \ buildctl build \
--frontend gateway.v0 \ --frontend gateway.v0 \
--opt source=docker/dockerfile \ --opt source=docker/dockerfile \
--opt context=git://github.com/moby/moby \ --opt context=https://github.com/moby/moby.git \
--opt build-arg:APT_MIRROR=cdn-fastly.deb.debian.org --opt build-arg:APT_MIRROR=cdn-fastly.deb.debian.org
``` ```

2
vendor/github.com/moby/buildkit/api/services/control/generate.go generated vendored
View File

@ -1,3 +1,3 @@
package moby_buildkit_v1 //nolint:golint package moby_buildkit_v1 //nolint:revive
//go:generate protoc -I=. -I=../../../vendor/ -I=../../../../../../ --gogo_out=plugins=grpc:. control.proto //go:generate protoc -I=. -I=../../../vendor/ -I=../../../../../../ --gogo_out=plugins=grpc:. control.proto

2
vendor/github.com/moby/buildkit/api/types/generate.go generated vendored
View File

@ -1,3 +1,3 @@
package moby_buildkit_v1_types //nolint:golint package moby_buildkit_v1_types //nolint:revive
//go:generate protoc -I=. -I=../../vendor/ -I=../../../../../ --gogo_out=plugins=grpc:. worker.proto //go:generate protoc -I=. -I=../../vendor/ -I=../../../../../ --gogo_out=plugins=grpc:. worker.proto

1
vendor/github.com/moby/buildkit/client/client_unix.go generated vendored
View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows // +build !windows
package client package client

2
vendor/github.com/moby/buildkit/frontend/gateway/pb/caps.go generated vendored
View File

@ -1,4 +1,4 @@
package moby_buildkit_v1_frontend //nolint:golint package moby_buildkit_v1_frontend //nolint:revive
import "github.com/moby/buildkit/util/apicaps" import "github.com/moby/buildkit/util/apicaps"

2
vendor/github.com/moby/buildkit/frontend/gateway/pb/generate.go generated vendored
View File

@ -1,3 +1,3 @@
package moby_buildkit_v1_frontend //nolint:golint package moby_buildkit_v1_frontend //nolint:revive
//go:generate protoc -I=. -I=../../../vendor/ -I=../../../../../../ --gogo_out=plugins=grpc:. gateway.proto //go:generate protoc -I=. -I=../../../vendor/ -I=../../../../../../ --gogo_out=plugins=grpc:. gateway.proto

15
vendor/github.com/moby/buildkit/go.mod generated vendored
View File

@ -9,7 +9,7 @@ require (
github.com/Microsoft/hcsshim v0.8.10 github.com/Microsoft/hcsshim v0.8.10
github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58 // indirect github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58 // indirect
github.com/containerd/console v1.0.1 github.com/containerd/console v1.0.1
github.com/containerd/containerd v1.4.1-0.20201117152358-0edc412565dc github.com/containerd/containerd v1.4.1-0.20201117152358-0edc412565dc // the actual version is replaced in replace()
github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe
github.com/containerd/go-cni v1.0.1 github.com/containerd/go-cni v1.0.1
github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0 github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0
@ -46,6 +46,7 @@ require (
github.com/opencontainers/image-spec v1.0.1 github.com/opencontainers/image-spec v1.0.1
github.com/opencontainers/runc v1.0.0-rc92 github.com/opencontainers/runc v1.0.0-rc92
github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6 github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6
github.com/opencontainers/selinux v1.8.0
github.com/opentracing-contrib/go-stdlib v1.0.0 github.com/opentracing-contrib/go-stdlib v1.0.0
github.com/opentracing/opentracing-go v1.2.0 github.com/opentracing/opentracing-go v1.2.0
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
@ -62,7 +63,7 @@ require (
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
golang.org/x/net v0.0.0-20200707034311-ab3426394381 golang.org/x/net v0.0.0-20200707034311-ab3426394381
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20201013081832-0aaa2718063a golang.org/x/sys v0.0.0-20210507161434-a76c4d0a0096
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1
// genproto: the actual version is replaced in replace() // genproto: the actual version is replaced in replace()
google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece
@ -70,6 +71,16 @@ require (
) )
replace ( replace (
// containerd: vendoring from the docker/20.10 branch in https://github.com/moby/containerd
//
// Forked from 0edc412565dcc6e3d6125ff9e4b009ad4b89c638 (20201117) with:
// - `images: validate document type before unmarshal` (eb9ba7ed8d46d48fb22362f9d91fff6fb837e37e)
// - `schema1: reject ambiguous documents` (70c88f507579277ab7af23b06666e3b57d4b4f2d)
// - `Fix the Inheritable capability defaults` (6906b57c721f9114377ceb069662b196876915c0)
// - `Adjust overlay tests to expect "index=off"` (#4719, for ease of cherry-picking #5076)
// - `overlay: support "userxattr" option (kernel 5.11)` (#5076)
// - `docker: avoid concurrent map access panic` (#4855)
github.com/containerd/containerd => github.com/moby/containerd v0.0.0-20220901192706-96c5ae04b678
// protobuf: corresponds to containerd // protobuf: corresponds to containerd
github.com/golang/protobuf => github.com/golang/protobuf v1.3.5 github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
github.com/hashicorp/go-immutable-radix => github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe github.com/hashicorp/go-immutable-radix => github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe

2
vendor/github.com/moby/buildkit/solver/errdefs/solve.go generated vendored
View File

@ -14,7 +14,7 @@ func init() {
typeurl.Register((*Solve)(nil), "github.com/moby/buildkit", "errdefs.Solve+json") typeurl.Register((*Solve)(nil), "github.com/moby/buildkit", "errdefs.Solve+json")
} }
//nolint:golint //nolint:revive
type IsSolve_Subject isSolve_Subject type IsSolve_Subject isSolve_Subject
// SolveError will be returned when an error is encountered during a solve that // SolveError will be returned when an error is encountered during a solve that

2
vendor/github.com/moby/buildkit/util/apicaps/pb/generate.go generated vendored
View File

@ -1,3 +1,3 @@
package moby_buildkit_v1_apicaps //nolint:golint package moby_buildkit_v1_apicaps //nolint:revive
//go:generate protoc -I=. -I=../../../vendor/ -I=../../../../../../ --gogo_out=plugins=grpc:. caps.proto //go:generate protoc -I=. -I=../../../vendor/ -I=../../../../../../ --gogo_out=plugins=grpc:. caps.proto

1
vendor/github.com/moby/buildkit/util/appcontext/appcontext_unix.go generated vendored
View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows // +build !windows
package appcontext package appcontext

1
vendor/github.com/moby/buildkit/util/appdefaults/appdefaults_unix.go generated vendored
View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows // +build !windows
package appdefaults package appdefaults

1
vendor/github.com/moby/buildkit/util/system/path_unix.go generated vendored
View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows // +build !windows
package system package system

1
vendor/github.com/moby/buildkit/util/system/path_windows.go generated vendored
View File

@ -1,3 +1,4 @@
//go:build windows
// +build windows // +build windows
package system package system

1
vendor/github.com/moby/buildkit/util/system/seccomp_linux.go generated vendored
View File

@ -1,3 +1,4 @@
//go:build linux && seccomp
// +build linux,seccomp // +build linux,seccomp
package system package system

1
vendor/github.com/moby/buildkit/util/system/seccomp_nolinux.go generated vendored
View File

@ -1,3 +1,4 @@
//go:build !linux && seccomp
// +build !linux,seccomp // +build !linux,seccomp
package system package system

1
vendor/github.com/moby/buildkit/util/system/seccomp_noseccomp.go generated vendored
View File

@ -1,3 +1,4 @@
//go:build !seccomp
// +build !seccomp // +build !seccomp
package system package system