tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-24 06:04:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

ServicePort merge_field should account for external IP and protocol

Browse Source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-06-09 16:58:24 -07:00 committed by Joffrey F
parent 0bcfc721f8
commit f3c1c8d158
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/config/types.py
View File

@ -325,7 +325,7 @@ class ServicePort(namedtuple('_ServicePort', 'target published protocol mode ext
@property @property
def merge_field(self): def merge_field(self):
return (self.target, self.published) return (self.target, self.published, self.external_ip, self.protocol)
def repr(self): def repr(self):
return dict( return dict(

2
tests/unit/config/config_test.py
View File

@ -1865,7 +1865,7 @@ class ConfigTest(unittest.TestCase):
{ {
'target': '1245', 'target': '1245',
'published': '1245', 'published': '1245',
'protocol': 'tcp', 'protocol': 'udp',
} }
] ]
} }