Merge pull request #4065 from thaJeztah/1.3_backport_namespace_path

estesp · web-flow · commit 50e5e156caa5 · 2020-02-27T08:56:51.000-05:00
[release/1.3 backport] fix killall when use pidnamespace
diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go
@@ -623,7 +623,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
`@@ -623,7 +623,7 @@ func shouldKillAllOnExit(bundlePath string) (bool, error) {`
`623`	`623`
`624`	`624`	`if bundleSpec.Linux != nil {`
`625`	`625`	`for _, ns := range bundleSpec.Linux.Namespaces {`
`626`		`- if ns.Type == specs.PIDNamespace {`
	`626`	`+ if ns.Type == specs.PIDNamespace && ns.Path == "" {`
`627`	`627`	`return false, nil`
`628`	`628`	`}`
`629`	`629`	`}`