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

Merge pull request #656 from AkihiroSuda/cap-ssh 

define CapMountSSH
docker-18.09
Tõnis Tiigi 2018-10-02 23:21:17 -07:00 committed by GitHub
parent 083d8b6ad9 758a267235
commit c9dc8352a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/llb/exec.go
View File

@ -199,6 +199,14 @@ func (e *ExecOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata,
} }
} }
if len(e.secrets) > 0 {
addCap(&e.constraints, pb.CapExecMountSecret)
}
if len(e.ssh) > 0 {
addCap(&e.constraints, pb.CapExecMountSSH)
}
pop, md := MarshalConstraints(c, &e.constraints) pop, md := MarshalConstraints(c, &e.constraints)
pop.Op = &pb.Op_Exec{ pop.Op = &pb.Op_Exec{
Exec: peo, Exec: peo,
@ -266,10 +274,6 @@ func (e *ExecOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata,
peo.Mounts = append(peo.Mounts, pm) peo.Mounts = append(peo.Mounts, pm)
} }
if len(e.secrets) > 0 {
addCap(&e.constraints, pb.CapMountSecret)
}
for _, s := range e.secrets { for _, s := range e.secrets {
pm := &pb.Mount{ pm := &pb.Mount{
Dest: s.Target, Dest: s.Target,

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},

11
solver/pb/caps.go
View File

@ -39,7 +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"
CapExecMountSSH apicaps.CapID = "exec.mount.ssh"
CapConstraints apicaps.CapID = "constraints" CapConstraints apicaps.CapID = "constraints"
CapPlatform apicaps.CapID = "platform" CapPlatform apicaps.CapID = "platform"
@ -207,7 +208,13 @@ func init() {
}) })
Caps.Init(apicaps.Cap{ Caps.Init(apicaps.Cap{
ID: CapMountSecret, ID: CapExecMountSecret,
Enabled: true,
Status: apicaps.CapStatusExperimental,
})
Caps.Init(apicaps.Cap{
ID: CapExecMountSSH,
Enabled: true, Enabled: true,
Status: apicaps.CapStatusExperimental, Status: apicaps.CapStatusExperimental,
}) })