dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-08-08 08:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

client/llb: fix cap marshalling

Browse Source 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda
2018-10-03 15:02:08 +09:00
parent 900a1b96c4
commit f542300a10
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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