docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tonicbupt-privilege'

This commit is contained in:
Joffrey F 2015-05-20 14:58:59 -07:00
parent d600073cef abbbbfb2d6
commit 08444cf355
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/client.py
View File

@ -531,9 +531,14 @@ class Client(requests.Session):
return self.exec_start(create_res, detach, tty, stream) return self.exec_start(create_res, detach, tty, stream)
def exec_create(self, container, cmd, stdout=True, stderr=True, tty=False): def exec_create(self, container, cmd, stdout=True, stderr=True, tty=False,
privileged=False):
if utils.compare_version('1.15', self._version) < 0: if utils.compare_version('1.15', self._version) < 0:
raise errors.InvalidVersion('Exec is not supported in API < 1.15') 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 isinstance(container, dict): if isinstance(container, dict):
container = container.get('Id') container = container.get('Id')
if isinstance(cmd, six.string_types): if isinstance(cmd, six.string_types):
@ -542,7 +547,7 @@ class Client(requests.Session):
data = { data = {
'Container': container, 'Container': container,
'User': '', 'User': '',
'Privileged': False, 'Privileged': privileged,
'Tty': tty, 'Tty': tty,
'AttachStdin': False, 'AttachStdin': False,
'AttachStdout': stdout, 'AttachStdout': stdout,