瀏覽代碼

Merge pull request #25771 from mrunalp/allow_host_ns_with_user

Allow using --pid=host and --net=host when --userns=host
Phil Estes 9 年之前
父節點
當前提交
3473980a29
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      daemon/daemon_unix.go

+ 2 - 2
daemon/daemon_unix.go

@@ -487,10 +487,10 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
 		if hostConfig.Privileged {
 			return warnings, fmt.Errorf("Privileged mode is incompatible with user namespaces")
 		}
-		if hostConfig.NetworkMode.IsHost() {
+		if hostConfig.NetworkMode.IsHost() && !hostConfig.UsernsMode.IsHost() {
 			return warnings, fmt.Errorf("Cannot share the host's network namespace when user namespaces are enabled")
 		}
-		if hostConfig.PidMode.IsHost() {
+		if hostConfig.PidMode.IsHost() && !hostConfig.UsernsMode.IsHost() {
 			return warnings, fmt.Errorf("Cannot share the host PID namespace when user namespaces are enabled")
 		}
 		if hostConfig.ReadonlyRootfs {