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 #753 from docker/715-user-int-uid 

Always send a string for the user param in create_container
This commit is contained in:
Joffrey F 2015-09-10 10:37:05 -07:00
parent 03f54f44e5 1e916a1e83
commit de5aab87b4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/utils/utils.py
View File

@ -719,7 +719,7 @@ def create_container_config(
'Hostname': hostname, 'Hostname': hostname,
'Domainname': domainname, 'Domainname': domainname,
'ExposedPorts': ports, 'ExposedPorts': ports,
'User': user, 'User': six.text_type(user) if user else None,
'Tty': tty, 'Tty': tty,
'OpenStdin': stdin_open, 'OpenStdin': stdin_open,
'StdinOnce': stdin_once, 'StdinOnce': stdin_once,

6
tests/integration_test.py
View File

@ -1621,3 +1621,9 @@ class TestRegressions(BaseTestCase):
ctnr = self.client.create_container('busybox', ['sleep', '2']) ctnr = self.client.create_container('busybox', ['sleep', '2'])
self.client.start(ctnr) self.client.start(ctnr)
self.client.stop(ctnr) self.client.stop(ctnr)
def test_715(self):
ctnr = self.client.create_container('busybox', ['id', '-u'], user=1000)
self.client.start(ctnr)
self.client.wait(ctnr)
assert self.client.logs(ctnr) == '1000\n'