Merge pull request #1665 from Mashimiao/gidmapping-valid-fix

Mrunal Patel · web-flow · commit c6e4a1ebeb1a · 2017-12-11T09:50:54.000-08:00
specconv: avoid skipping gidmappings applied when uidmappings is empty
diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go
@@ -620,9 +620,6 @@ func setupUserNamespace(spec *specs.Spec, config *configs.Config) error {
 		}
 	}
 	if spec.Linux != nil {
-		if len(spec.Linux.UIDMappings) == 0 {
-			return nil
-		}
 		for _, m := range spec.Linux.UIDMappings {
 			config.UidMappings = append(config.UidMappings, create(m))
 		}

Original file line number	Diff line number	Diff line change
`@@ -620,9 +620,6 @@ func setupUserNamespace(spec specs.Spec, config configs.Config) error {`
`620`	`620`	`}`
`621`	`621`	`}`
`622`	`622`	`if spec.Linux != nil {`
`623`		`- if len(spec.Linux.UIDMappings) == 0 {`
`624`		`- return nil`
`625`		`- }`
`626`	`623`	`for _, m := range spec.Linux.UIDMappings {`
`627`	`624`	`config.UidMappings = append(config.UidMappings, create(m))`
`628`	`625`	`}`