From ab684537e4be46a0edd69975ffffd47c6f994abb Mon Sep 17 00:00:00 2001
From: Lei Jitang <leijitang@huawei.com>
Date: Sat, 11 Apr 2015 11:04:24 +0800
Subject: [PATCH] Add `-u|--user` flag to docker exec for running command as a
 different user

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3ca275df6d415e46deebbe3bfe7c6039ca9ed4b7
Component: cli
---
 components/cli/contrib/completion/bash/docker            | 2 +-
 components/cli/docs/sources/reference/commandline/cli.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker
index ad48f2886c..ef7f0f3356 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 -t --tty" -- "$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 10953dc2d5..8a7809532d 100644
--- a/components/cli/docs/sources/reference/commandline/cli.md
+++ b/components/cli/docs/sources/reference/commandline/cli.md
@@ -1121,6 +1121,7 @@ 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
       -t, --tty=false            Allocate a pseudo-TTY
+      -u, --user=                Username or UID (format: <name|uid>[:<group|gid>])
 
 The `docker exec` command runs a new command in a running container.