JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s/CapMount/CapExecMount/g 

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
docker-18.09
Akihiro Suda 2018-10-03 15:03:36 +09:00
parent f542300a10
commit 758a267235
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/llb/exec.go
View File

@ -200,11 +200,11 @@ func (e *ExecOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata,
} }
if len(e.secrets) > 0 { if len(e.secrets) > 0 {
addCap(&e.constraints, pb.CapMountSecret) addCap(&e.constraints, pb.CapExecMountSecret)
} }
if len(e.ssh) > 0 { if len(e.ssh) > 0 {
addCap(&e.constraints, pb.CapMountSSH) addCap(&e.constraints, pb.CapExecMountSSH)
} }
pop, md := MarshalConstraints(c, &e.constraints) pop, md := MarshalConstraints(c, &e.constraints)

2
frontend/gateway/grpcclient/client.go
View File

@ -207,7 +207,7 @@ func defaultLLBCaps() []apicaps.PBCap {
{ID: string(opspb.CapExecMountCacheSharing), Enabled: true}, {ID: string(opspb.CapExecMountCacheSharing), Enabled: true},
{ID: string(opspb.CapExecMountSelector), Enabled: true}, {ID: string(opspb.CapExecMountSelector), Enabled: true},
{ID: string(opspb.CapExecMountTmpfs), Enabled: true}, {ID: string(opspb.CapExecMountTmpfs), Enabled: true},
{ID: string(opspb.CapMountSecret), Enabled: true}, {ID: string(opspb.CapExecMountSecret), Enabled: true},
{ID: string(opspb.CapConstraints), Enabled: true}, {ID: string(opspb.CapConstraints), Enabled: true},
{ID: string(opspb.CapPlatform), Enabled: true}, {ID: string(opspb.CapPlatform), Enabled: true},
{ID: string(opspb.CapMetaIgnoreCache), Enabled: true}, {ID: string(opspb.CapMetaIgnoreCache), Enabled: true},

8
solver/pb/caps.go
View File

@ -39,8 +39,8 @@ const (
CapExecMountCacheSharing apicaps.CapID = "exec.mount.cache.sharing" CapExecMountCacheSharing apicaps.CapID = "exec.mount.cache.sharing"
CapExecMountSelector apicaps.CapID = "exec.mount.selector" CapExecMountSelector apicaps.CapID = "exec.mount.selector"
CapExecMountTmpfs apicaps.CapID = "exec.mount.tmpfs" CapExecMountTmpfs apicaps.CapID = "exec.mount.tmpfs"
CapMountSecret apicaps.CapID = "exec.mount.secret" CapExecMountSecret apicaps.CapID = "exec.mount.secret"
CapMountSSH apicaps.CapID = "exec.mount.ssh" CapExecMountSSH apicaps.CapID = "exec.mount.ssh"
CapConstraints apicaps.CapID = "constraints" CapConstraints apicaps.CapID = "constraints"
CapPlatform apicaps.CapID = "platform" CapPlatform apicaps.CapID = "platform"
@ -208,13 +208,13 @@ func init() {
}) })
Caps.Init(apicaps.Cap{ Caps.Init(apicaps.Cap{
ID: CapMountSecret, ID: CapExecMountSecret,
Enabled: true, Enabled: true,
Status: apicaps.CapStatusExperimental, Status: apicaps.CapStatusExperimental,
}) })
Caps.Init(apicaps.Cap{ Caps.Init(apicaps.Cap{
ID: CapMountSSH, ID: CapExecMountSSH,
Enabled: true, Enabled: true,
Status: apicaps.CapStatusExperimental, Status: apicaps.CapStatusExperimental,
}) })