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

If attaching to stdin, set StdinOnce, as per the docker CLI.

This commit is contained in:
Aanand Prasad 2014-01-20 18:00:40 +00:00
parent 236bb5f09e
commit f2285cb899
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/client.py
View File

@ -152,6 +152,7 @@ class Client(requests.Session):
attach_stdin = False attach_stdin = False
attach_stdout = False attach_stdout = False
attach_stderr = False attach_stderr = False
stdin_once = False
if not detach: if not detach:
attach_stdout = True attach_stdout = True
@ -159,6 +160,7 @@ class Client(requests.Session):
if stdin_open: if stdin_open:
attach_stdin = True attach_stdin = True
stdin_once = True
return { return {
'Hostname': hostname, 'Hostname': hostname,
@ -166,6 +168,7 @@ class Client(requests.Session):
'User': user, 'User': user,
'Tty': tty, 'Tty': tty,
'OpenStdin': stdin_open, 'OpenStdin': stdin_open,
'StdinOnce': stdin_once,
'Memory': mem_limit, 'Memory': mem_limit,
'AttachStdin': attach_stdin, 'AttachStdin': attach_stdin,
'AttachStdout': attach_stdout, 'AttachStdout': attach_stdout,

26
tests/test.py
View File

@ -176,6 +176,7 @@ class DockerClientTest(unittest.TestCase):
{"Tty": false, "Image": "busybox", "Cmd": ["true"], {"Tty": false, "Image": "busybox", "Cmd": ["true"],
"AttachStdin": false, "Memory": 0, "AttachStdin": false, "Memory": 0,
"AttachStderr": true, "AttachStdout": true, "AttachStderr": true, "AttachStdout": true,
"StdinOnce": false,
"OpenStdin": false, "NetworkDisabled": false}''')) "OpenStdin": false, "NetworkDisabled": false}'''))
self.assertEqual(args[1]['headers'], self.assertEqual(args[1]['headers'],
{'Content-Type': 'application/json'}) {'Content-Type': 'application/json'})
@ -200,6 +201,7 @@ class DockerClientTest(unittest.TestCase):
"Volumes": {"/mnt": {}}, "Memory": 0, "Volumes": {"/mnt": {}}, "Memory": 0,
"AttachStderr": true, "AttachStderr": true,
"AttachStdout": true, "OpenStdin": false, "AttachStdout": true, "OpenStdin": false,
"StdinOnce": false,
"NetworkDisabled": false}''')) "NetworkDisabled": false}'''))
self.assertEqual(args[1]['headers'], self.assertEqual(args[1]['headers'],
{'Content-Type': 'application/json'}) {'Content-Type': 'application/json'})
@ -225,6 +227,7 @@ class DockerClientTest(unittest.TestCase):
}, },
"AttachStderr": true, "AttachStderr": true,
"AttachStdout": true, "OpenStdin": false, "AttachStdout": true, "OpenStdin": false,
"StdinOnce": false,
"NetworkDisabled": false}''')) "NetworkDisabled": false}'''))
self.assertEqual(args[1]['headers'], self.assertEqual(args[1]['headers'],
{'Content-Type': 'application/json'}) {'Content-Type': 'application/json'})
@ -246,6 +249,7 @@ class DockerClientTest(unittest.TestCase):
"Memory": 0, "Memory": 0,
"AttachStderr": true, "AttachStderr": true,
"AttachStdout": true, "OpenStdin": false, "AttachStdout": true, "OpenStdin": false,
"StdinOnce": false,
"NetworkDisabled": false, "NetworkDisabled": false,
"Entrypoint": "cowsay"}''')) "Entrypoint": "cowsay"}'''))
self.assertEqual(args[1]['headers'], self.assertEqual(args[1]['headers'],
@ -268,6 +272,7 @@ class DockerClientTest(unittest.TestCase):
"Memory": 0, "Memory": 0,
"AttachStderr": true, "AttachStderr": true,
"AttachStdout": true, "OpenStdin": false, "AttachStdout": true, "OpenStdin": false,
"StdinOnce": false,
"NetworkDisabled": false, "NetworkDisabled": false,
"CpuShares": 5}''')) "CpuShares": 5}'''))
self.assertEqual(args[1]['headers'], self.assertEqual(args[1]['headers'],
@ -290,11 +295,31 @@ class DockerClientTest(unittest.TestCase):
"Memory": 0, "Memory": 0,
"AttachStderr": true, "AttachStderr": true,
"AttachStdout": true, "OpenStdin": false, "AttachStdout": true, "OpenStdin": false,
"StdinOnce": false,
"NetworkDisabled": false, "NetworkDisabled": false,
"WorkingDir": "/root"}''')) "WorkingDir": "/root"}'''))
self.assertEqual(args[1]['headers'], self.assertEqual(args[1]['headers'],
{'Content-Type': 'application/json'}) {'Content-Type': 'application/json'})
def test_create_container_with_stdin_open(self):
try:
self.client.create_container('busybox', 'true', stdin_open=True)
except Exception as e:
self.fail('Command should not raise exception: {0}'.format(e))
args = fake_request.call_args
self.assertEqual(args[0][0],
'unix://var/run/docker.sock/v1.6/containers/create')
self.assertEqual(json.loads(args[1]['data']),
json.loads('''
{"Tty": false, "Image": "busybox", "Cmd": ["true"],
"AttachStdin": true, "Memory": 0,
"AttachStderr": true, "AttachStdout": true,
"StdinOnce": true,
"OpenStdin": true, "NetworkDisabled": false}'''))
self.assertEqual(args[1]['headers'],
{'Content-Type': 'application/json'})
def test_create_named_container(self): def test_create_named_container(self):
try: try:
self.client.create_container('busybox', 'true', self.client.create_container('busybox', 'true',
@ -310,6 +335,7 @@ class DockerClientTest(unittest.TestCase):
{"Tty": false, "Image": "busybox", "Cmd": ["true"], {"Tty": false, "Image": "busybox", "Cmd": ["true"],
"AttachStdin": false, "Memory": 0, "AttachStdin": false, "Memory": 0,
"AttachStderr": true, "AttachStdout": true, "AttachStderr": true, "AttachStdout": true,
"StdinOnce": false,
"OpenStdin": false, "NetworkDisabled": false}''')) "OpenStdin": false, "NetworkDisabled": false}'''))
self.assertEqual(args[1]['headers'], self.assertEqual(args[1]['headers'],
{'Content-Type': 'application/json'}) {'Content-Type': 'application/json'})