Skip to content

Commit e447061

Browse files
committed
oci: do not append conmon env to container process
Signed-off-by: Antonio Murdaca <[email protected]>
1 parent 3a36f55 commit e447061

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

oci/oci.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp
412412
os.RemoveAll(logPath)
413413
}()
414414

415-
f, err := ioutil.TempFile("", "exec-process")
415+
f, err := ioutil.TempFile("", "exec-sync-process")
416416
if err != nil {
417417
return nil, ExecSyncError{
418418
ExitCode: -1,
@@ -436,7 +436,6 @@ func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp
436436
args = append(args, "-l", logPath)
437437

438438
pspec := c.Spec().Process
439-
pspec.Env = append(pspec.Env, r.conmonEnv...)
440439
pspec.Args = command
441440
processJSON, err := json.Marshal(pspec)
442441
if err != nil {

0 commit comments

Comments
 (0)