From 7f45a0e52c2a08d94b136ccd88cb860351a4af61 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Thu, 9 May 2019 22:06:10 +0000 Subject: [PATCH] vendor buildkit to 646fc0af6d283397b9e47cd0a18779e9d0376e0e (v0.5.1) Signed-off-by: Tibor Vass --- vendor.conf | 2 +- vendor/github.com/moby/buildkit/client/llb/exec.go | 2 +- .../buildkit/session/auth/authprovider/authprovider.go | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/vendor.conf b/vendor.conf index bf0d6e9467..9f4fd0a497 100755 --- a/vendor.conf +++ b/vendor.conf @@ -51,7 +51,7 @@ github.com/Microsoft/go-winio 84b4ab48a50763fe7b3abcef38e5 github.com/Microsoft/hcsshim 672e52e9209d1e53718c1b6a7d68cc9272654ab5 github.com/miekg/pkcs11 6120d95c0e9576ccf4a78ba40855809dca31a9ed github.com/mitchellh/mapstructure f15292f7a699fcc1a38a80977f80a046874ba8ac -github.com/moby/buildkit 8818c67cff663befa7b70f21454e340f71616581 +github.com/moby/buildkit 646fc0af6d283397b9e47cd0a18779e9d0376e0e # v0.5.1 github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 # 1.0.3 github.com/modern-go/reflect2 4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd # 1.0.1 github.com/morikuni/aec 39771216ff4c63d11f5e604076f9c45e8be1067b diff --git a/vendor/github.com/moby/buildkit/client/llb/exec.go b/vendor/github.com/moby/buildkit/client/llb/exec.go index e45a23309d..8e2d1d4c9d 100644 --- a/vendor/github.com/moby/buildkit/client/llb/exec.go +++ b/vendor/github.com/moby/buildkit/client/llb/exec.go @@ -177,7 +177,7 @@ func (e *ExecOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata, addCap(&e.constraints, pb.CapExecMetaNetwork) } - if e.meta.Security != SecurityModeInsecure { + if e.meta.Security != SecurityModeSandbox { addCap(&e.constraints, pb.CapExecMetaSecurity) } diff --git a/vendor/github.com/moby/buildkit/session/auth/authprovider/authprovider.go b/vendor/github.com/moby/buildkit/session/auth/authprovider/authprovider.go index a286567e44..7df33cca4b 100644 --- a/vendor/github.com/moby/buildkit/session/auth/authprovider/authprovider.go +++ b/vendor/github.com/moby/buildkit/session/auth/authprovider/authprovider.go @@ -3,6 +3,7 @@ package authprovider import ( "context" "io/ioutil" + "sync" "github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config/configfile" @@ -19,6 +20,12 @@ func NewDockerAuthProvider() session.Attachable { type authProvider struct { config *configfile.ConfigFile + + // The need for this mutex is not well understood. + // Without it, the docker cli on OS X hangs when + // reading credentials from docker-credential-osxkeychain. + // See issue https://github.com/docker/cli/issues/1862 + mu sync.Mutex } func (ap *authProvider) Register(server *grpc.Server) { @@ -26,6 +33,8 @@ func (ap *authProvider) Register(server *grpc.Server) { } func (ap *authProvider) Credentials(ctx context.Context, req *auth.CredentialsRequest) (*auth.CredentialsResponse, error) { + ap.mu.Lock() + defer ap.mu.Unlock() if req.Host == "registry-1.docker.io" { req.Host = "https://index.docker.io/v1/" }