summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorStephen Newey <stephen.newey@arm.com>2015-06-30 13:23:42 +0100
committerStephen Newey <stephen.newey@arm.com>2015-06-30 13:23:42 +0100
commit6a5a2565092e26769ebd490a8e3bbe18d82fade9 (patch)
tree126ef4b3cfa2f8908ee998378022f4aa01e4ddae /docker
parentd300f5f323cd182c30b464334412db3f76be75e1 (diff)
downloaddocker-py-6a5a2565092e26769ebd490a8e3bbe18d82fade9.tar.gz
Add support for user on exec_create.
Diffstat (limited to 'docker')
-rw-r--r--docker/client.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/docker/client.py b/docker/client.py
index 998ebac..274359b 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -521,19 +521,26 @@ class Client(requests.Session):
return self.exec_start(create_res, detach, tty, stream)
def exec_create(self, container, cmd, stdout=True, stderr=True, tty=False,
- privileged=False):
+ user=None, privileged=False):
if utils.compare_version('1.15', self._version) < 0:
raise errors.InvalidVersion('Exec is not supported in API < 1.15')
if privileged and utils.compare_version('1.19', self._version) < 0:
raise errors.InvalidVersion(
'Privileged exec is not supported in API < 1.19'
)
+ if user and utils.compare_version('1.19', self._version) < 0:
+ raise errors.InvalidVersion(
+ 'User-specific exec is not supported in API < 1.19'
+ )
if isinstance(cmd, six.string_types):
cmd = shlex.split(str(cmd))
+ if user is None:
+ user = ''
+
data = {
'Container': container,
- 'User': '',
+ 'User': user,
'Privileged': privileged,
'Tty': tty,
'AttachStdin': False,