vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

oci: do not append conmon env to container process

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-11-30 10:44:20 +01:00
parent c6f68f1bf1
commit b59f31a2d5
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
oci/oci.go
View file

@ -423,7 +423,7 @@ func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp
os.RemoveAll(logPath) os.RemoveAll(logPath)
}() }()
f, err := ioutil.TempFile("", "exec-process") f, err := ioutil.TempFile("", "exec-sync-process")
if err != nil { if err != nil {
return nil, ExecSyncError{ return nil, ExecSyncError{
ExitCode: -1, ExitCode: -1,
@ -448,7 +448,6 @@ func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp
args = append(args, "--socket-dir-path", ContainerAttachSocketDir) args = append(args, "--socket-dir-path", ContainerAttachSocketDir)
pspec := c.Spec().Process pspec := c.Spec().Process
pspec.Env = append(pspec.Env, r.conmonEnv...)
pspec.Args = command pspec.Args = command
processJSON, err := json.Marshal(pspec) processJSON, err := json.Marshal(pspec)
if err != nil { if err != nil {