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

make conmon inherit env from ocid

Browse source 
Signed-off-by: HaoZhang <crazykev@zju.edu.cn>
This commit is contained in:
HaoZhang 2016-10-17 15:44:27 +08:00
parent af55785b53
commit 9c11cc7dba
4 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/server.go
View file

@ -222,7 +222,7 @@ func New(config *Config) (*Server, error) {
return nil, err
}
r, err := oci.New(config.Runtime, config.ContainerDir, config.Conmon)
r, err := oci.New(config.Runtime, config.ContainerDir, config.Conmon, config.ConmonEnv)
if err != nil {
return nil, err
}