Make the dockershim root directory configurable

Make the dockershim root directory configurable so things like
integration tests (e.g. in OpenShift) can run as non-root.
This commit is contained in:
Andy Goldstein
2017-04-11 15:57:49 -04:00
parent 7a1687dc93
commit 00e11566f2
7 changed files with 23 additions and 17 deletions

View File

@@ -46,7 +46,7 @@ func main() {
verflag.PrintAndExitIfRequested()
if s.ExperimentalDockershim {
if err := app.RunDockershim(&s.KubeletConfiguration); err != nil {
if err := app.RunDockershim(&s.KubeletConfiguration, s.DockershimRootDirectory); err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err)
os.Exit(1)
}