Merge pull request #14596 from giuseppe/move-conmon-different-cgroup-system-service

libpod: improve check to create conmon cgroup
This commit is contained in:
openshift-ci[bot]
2022-06-15 16:18:18 +00:00
committed by GitHub
3 changed files with 30 additions and 1 deletions

View File

@ -1435,7 +1435,7 @@ func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec
}
// $INVOCATION_ID is set by systemd when running as a service.
if os.Getenv("INVOCATION_ID") != "" {
if ctr.runtime.RemoteURI() == "" && os.Getenv("INVOCATION_ID") != "" {
mustCreateCgroup = false
}