opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-17 23:20:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #293 from rhatdan/sd_notify

Browse Source 
Need to add LISTEN_PID environment variable to conmon command
This commit is contained in:
Matthew Heon
2018-02-07 18:59:50 -05:00
committed by GitHub
parent dd9ecc7a23 d1c0c42a08
commit e47c2e390a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/oci.go
View File

@ -215,7 +215,7 @@ func (r *OCIRuntime) createContainer(ctr *Container, cgroupParent string) (err e
cmd.Env = append(cmd.Env, fmt.Sprintf("NOTIFY_SOCKET=%s", notify)) cmd.Env = append(cmd.Env, fmt.Sprintf("NOTIFY_SOCKET=%s", notify))
} }
if listenfds, ok := os.LookupEnv("LISTEN_FDS"); ok { if listenfds, ok := os.LookupEnv("LISTEN_FDS"); ok {
cmd.Env = append(cmd.Env, fmt.Sprintf("LISTEN_FDS=%s", listenfds)) cmd.Env = append(cmd.Env, fmt.Sprintf("LISTEN_FDS=%s", listenfds), "LISTEN_PID=1")
fds := activation.Files(false) fds := activation.Files(false)
cmd.ExtraFiles = append(cmd.ExtraFiles, fds...) cmd.ExtraFiles = append(cmd.ExtraFiles, fds...)
} }