Merge pull request #2374 from mheon/rootless_recursive_start

Ensure that userns is created for stopped rootless pods
This commit is contained in:
OpenShift Merge Robot
2019-02-20 14:58:13 +01:00
committed by GitHub

View File

@ -868,6 +868,12 @@ func joinOrCreateRootlessUserNamespace(createConfig *cc.CreateConfig, runtime *l
if err != nil {
return false, -1, err
}
if pid == 0 {
if createConfig.Pod != "" {
continue
}
return false, -1, errors.Errorf("dependency container %s is not running", ctr.ID())
}
return rootless.JoinNS(uint(pid))
}
}