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

Allow ports to be specified in '1234/tcp' format

This commit is contained in:
Aanand Prasad 2014-01-22 17:01:10 +00:00
parent ae67d55bf2
commit df9f66d437
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fig/service.py
View File

@ -172,9 +172,10 @@ class Service(object):
port = str(port) port = str(port)
if ':' in port: if ':' in port:
external_port, internal_port = port.split(':', 1) external_port, internal_port = port.split(':', 1)
port_bindings[int(internal_port)] = int(external_port)
else: else:
port_bindings[int(port)] = None external_port, internal_port = (None, port)
port_bindings[internal_port] = external_port
volume_bindings = {} volume_bindings = {}
@ -225,6 +226,8 @@ class Service(object):
port = str(port) port = str(port)
if ':' in port: if ':' in port:
port = port.split(':')[-1] port = port.split(':')[-1]
if '/' in port:
port = tuple(port.split('/'))
ports.append(port) ports.append(port)
container_options['ports'] = ports container_options['ports'] = ports

5
tests/service_test.py
View File

@ -187,6 +187,11 @@ class ServiceTest(DockerClientTestCase):
self.assertEqual(container['HostConfig']['PortBindings'].keys(), ['8000/tcp']) self.assertEqual(container['HostConfig']['PortBindings'].keys(), ['8000/tcp'])
self.assertNotEqual(container['HostConfig']['PortBindings']['8000/tcp'][0]['HostPort'], '8000') self.assertNotEqual(container['HostConfig']['PortBindings']['8000/tcp'][0]['HostPort'], '8000')
def test_start_container_creates_port_with_explicit_protocol(self):
service = self.create_service('web', ports=['8000/udp'])
container = service.start_container().inspect()
self.assertEqual(container['HostConfig']['PortBindings'].keys(), ['8000/udp'])
def test_start_container_creates_fixed_external_ports(self): def test_start_container_creates_fixed_external_ports(self):
service = self.create_service('web', ports=['8000:8000']) service = self.create_service('web', ports=['8000:8000'])
container = service.start_container().inspect() container = service.start_container().inspect()