From 6b897604a6e3ce545e85b6136706640117c6f9c7 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Tue, 26 May 2015 14:02:10 -0700 Subject: [PATCH] Revert "Add docker exec run a command in privileged mode" This reverts commit 72a500e9e5929b038816d8bd18d462a19e571c99. Signed-off-by: Jessica Frazelle Conflicts: daemon/execdriver/native/exec.go integration-cli/docker_cli_exec_test.go runconfig/exec.go Upstream-commit: 05c0da3b96b4128fa463b61649824894fc0019ac Component: cli --- components/cli/contrib/completion/bash/docker | 2 +- components/cli/docs/sources/reference/commandline/cli.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index 93c48966c0..0f4e2f1a75 100755 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -407,7 +407,7 @@ _docker_events() { _docker_exec() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--detach -d --help --interactive -i --privileged -t --tty -u --user" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--detach -d --help --interactive -i -t --tty -u --user" -- "$cur" ) ) ;; *) __docker_containers_running diff --git a/components/cli/docs/sources/reference/commandline/cli.md b/components/cli/docs/sources/reference/commandline/cli.md index 3093aa2e50..3d92b3ed67 100644 --- a/components/cli/docs/sources/reference/commandline/cli.md +++ b/components/cli/docs/sources/reference/commandline/cli.md @@ -1201,7 +1201,6 @@ You'll need two shells for this example. -d, --detach=false Detached mode: run command in the background -i, --interactive=false Keep STDIN open even if not attached - --privileged=false Give extended privileges to the command -t, --tty=false Allocate a pseudo-TTY -u, --user= Username or UID (format: [:])