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

add current tracing context detection and exec propagation

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit bc9a83144c83e9fd78007b7bfe92e8082c59d40e)
This commit is contained in:
Tonis Tiigi
2021-06-08 20:01:18 -07:00
parent 1c037fd52f
commit 69a8caa3be
5 changed files with 145 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
executor/oci/spec.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/moby/buildkit/executor"
"github.com/moby/buildkit/snapshot"
"github.com/moby/buildkit/util/network"
traceexec "github.com/moby/buildkit/util/tracing/exec"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/selinux/go-selinux"
"github.com/pkg/errors"
@@ -76,6 +77,8 @@ func GenerateSpec(ctx context.Context, meta executor.Meta, mounts []executor.Mou
hostname = meta.Hostname
}
meta.Env = append(meta.Env, traceexec.Environ(ctx)...)
opts = append(opts,
oci.WithProcessArgs(meta.Args...),
oci.WithEnv(meta.Env),