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

Merge pull request #37 from aanand/set-attach-attributes 

When creating a container, set Attach* attributes according to detach and stdin_open arguments
This commit is contained in:
Joffrey F 2013-09-03 19:29:38 -07:00
parent 76a34c5fd3 fdcc4d9a09
commit d47b45d860
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/client.py
View File

@ -106,6 +106,18 @@ class Client(requests.Session):
command = shlex.split(str(command)) command = shlex.split(str(command))
if isinstance(environment, dict): if isinstance(environment, dict):
environment = ['{0}={1}'.format(k, v) for k, v in environment.items()] environment = ['{0}={1}'.format(k, v) for k, v in environment.items()]
attach_stdin = False
attach_stdout = False
attach_stderr = False
if not detach:
attach_stdout = True
attach_stderr = True
if stdin_open:
attach_stdin = True
return { return {
'Hostname': hostname, 'Hostname': hostname,
'PortSpecs': ports, 'PortSpecs': ports,
@ -113,9 +125,9 @@ class Client(requests.Session):
'Tty': tty, 'Tty': tty,
'OpenStdin': stdin_open, 'OpenStdin': stdin_open,
'Memory': mem_limit, 'Memory': mem_limit,
'AttachStdin': False, 'AttachStdin': attach_stdin,
'AttachStdout': False, 'AttachStdout': attach_stdout,
'AttachStderr': False, 'AttachStderr': attach_stderr,
'Env': environment, 'Env': environment,
'Cmd': command, 'Cmd': command,
'Dns': dns, 'Dns': dns,