From 4cde515268e65ad2b3768478979f278c666029a7 Mon Sep 17 00:00:00 2001
From: Antonio Murdaca <runcom@redhat.com>
Date: Thu, 30 Nov 2017 10:44:20 +0100
Subject: [PATCH] oci: do not append conmon env to container process

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
---
 oci/oci.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/oci/oci.go b/oci/oci.go
index 1cf1964b..4c3de0be 100644
--- a/oci/oci.go
+++ b/oci/oci.go
@@ -415,7 +415,7 @@ func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp
 		os.RemoveAll(logPath)
 	}()
 
-	f, err := ioutil.TempFile("", "exec-process")
+	f, err := ioutil.TempFile("", "exec-sync-process")
 	if err != nil {
 		return nil, ExecSyncError{
 			ExitCode: -1,
@@ -440,7 +440,6 @@ func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp
 	args = append(args, "--socket-dir-path", ContainerAttachSocketDir)
 
 	pspec := c.Spec().Process
-	pspec.Env = append(pspec.Env, r.conmonEnv...)
 	pspec.Args = command
 	processJSON, err := json.Marshal(pspec)
 	if err != nil {