Merge pull request #276 from fkluknav/docker-1.12.6

rhatdan · web-flow · commit f2f719e18ddc · 2017-10-16T14:26:10.000-04:00
BACKPORT: Add clarification to --privileged error message
diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
@@ -499,7 +499,7 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
 	// check for various conflicting options with user namespaces
 	if daemon.configStore.RemappedRoot != "" && hostConfig.UsernsMode.IsPrivate() {
 		if hostConfig.Privileged {
-			return warnings, fmt.Errorf("Privileged mode is incompatible with user namespaces")
+			return warnings, fmt.Errorf("Privileged mode is incompatible with user namespaces. You must run the container in the host namespace (--userns=host) when running privileged mode.")
 		}
 		if hostConfig.NetworkMode.IsHost() && !hostConfig.UsernsMode.IsHost() {
 			return warnings, fmt.Errorf("Cannot share the host's network namespace when user namespaces are enabled")

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ func verifyPlatformContainerSettings(daemon Daemon, hostConfig containertypes.`
`499`	`499`	`// check for various conflicting options with user namespaces`
`500`	`500`	`if daemon.configStore.RemappedRoot != "" && hostConfig.UsernsMode.IsPrivate() {`
`501`	`501`	`if hostConfig.Privileged {`
`502`		`- return warnings, fmt.Errorf("Privileged mode is incompatible with user namespaces")`
	`502`	`+ return warnings, fmt.Errorf("Privileged mode is incompatible with user namespaces. You must run the container in the host namespace (--userns=host) when running privileged mode.")`
`503`	`503`	`}`
`504`	`504`	`if hostConfig.NetworkMode.IsHost() && !hostConfig.UsernsMode.IsHost() {`
`505`	`505`	`return warnings, fmt.Errorf("Cannot share the host's network namespace when user namespaces are enabled")`