Merge pull request #3274 from thaJeztah/1.2_backport_pidnamespace

estesp · web-flow · commit d0319ec44af6 · 2019-05-10T21:01:54.000+02:00
[release/1.2 backport] fix killall when use pidnamespace
diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go
@@ -545,7 +545,7 @@ func shouldKillAllOnExit(bundlePath string) (bool, error) {
 
 	if bundleSpec.Linux != nil {
 		for _, ns := range bundleSpec.Linux.Namespaces {
-			if ns.Type == specs.PIDNamespace {
+			if ns.Type == specs.PIDNamespace && ns.Path == "" {
 				return false, nil
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ func shouldKillAllOnExit(bundlePath string) (bool, error) {`
`545`	`545`
`546`	`546`	`if bundleSpec.Linux != nil {`
`547`	`547`	`for _, ns := range bundleSpec.Linux.Namespaces {`
`548`		`- if ns.Type == specs.PIDNamespace {`
	`548`	`+ if ns.Type == specs.PIDNamespace && ns.Path == "" {`
`549`	`549`	`return false, nil`
`550`	`550`	`}`
`551`	`551`	`}`