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

Shortened lines

This commit is contained in:
Ulises Reyes 2013-12-14 22:28:45 -05:00
parent a7c1449757
commit daa3a1e2ef
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/client.py
View File

@ -540,13 +540,13 @@ class Client(requests.Session):
self._raise_for_status(res)
json_ = res.json()
s_port = str(private_port)
host_port_bindings = None
h_ports = None
host_port_bindings = json_['NetworkSettings']['Ports'].get(s_port +'/udp')
if host_port_bindings is None:
host_port_bindings = json_['NetworkSettings']['Ports'].get(s_port + '/tcp')
h_ports = json_['NetworkSettings']['Ports'].get(s_port + '/udp')
if h_ports is None:
h_ports = json_['NetworkSettings']['Ports'].get(s_port + '/tcp')
return host_port_bindings
return h_ports
def pull(self, repository, tag=None, stream=False):
registry, repo_name = auth.resolve_repository_name(repository)

3
tests/integration_test.py
View File

@ -405,7 +405,8 @@ class TestKillWithSignal(BaseTestCase):
class TestPort(BaseTestCase):
def runTest(self):
container = self.client.create_container('busybox', ['sleep', '9999'], ports=[1111, 2222])
container = self.client.create_container('busybox', ['sleep', '9999'],
ports=[1111, 2222])
id = container['Id']
self.client.start(container, port_bindings={
1111: ('127.0.0.1', 4567),