Merge pull request #2314 from ehazlett/runc-shim-debug

stevvooe · web-flow · commit c73794f8dc6c · 2018-04-26T12:09:16.000-07:00
Enable runc debug in shim
diff --git a/linux/runtime.go b/linux/runtime.go
@@ -510,6 +510,7 @@ func (r *Runtime) getRuntime(ctx context.Context, ns, id string) (*runc.Runc, er
 		LogFormat:    runc.JSON,
 		PdeathSignal: unix.SIGKILL,
 		Root:         filepath.Join(root, ns),
+		Debug:        r.config.ShimDebug,
 	}, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -510,6 +510,7 @@ func (r Runtime) getRuntime(ctx context.Context, ns, id string) (runc.Runc, er`
`510`	`510`	`LogFormat: runc.JSON,`
`511`	`511`	`PdeathSignal: unix.SIGKILL,`
`512`	`512`	`Root: filepath.Join(root, ns),`
	`513`	`+ Debug: r.config.ShimDebug,`
`513`	`514`	`}, nil`
`514`	`515`	`}`
`515`	`516`