Bump 1.14.0

Signed-off-by: Joffrey F <joffrey@docker.com>

CHANGELOG.md

@@ -1,7 +1,7 @@
 Change log
 ==========
 
-1.14.0 (2017-06-06)
+1.14.0 (2017-06-19)
 -------------------
 
 ### New features
@@ -41,6 +41,9 @@ Change log
 - Fixed a bug where `cache_from` in the build section would be ignored when
   using more than one Compose file.
 
+- Fixed a bug that prevented binding the same port to different IPs when
+  using more than one Compose file.
+
 - Fixed a bug where override files would not be picked up by Compose if they
   had the `.yaml` extension
 

compose/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.14.0-rc2'
+__version__ = '1.14.0'

compose/config/types.py

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

compose/container.py

@@ -96,12 +96,16 @@ class Container(object):
     def human_readable_ports(self):
         def format_port(private, public):
             if not public:
-                return private
-            return '{HostIp}:{HostPort}->{private}'.format(
-                private=private, **public[0])
+                return [private]
+            return [
+                '{HostIp}:{HostPort}->{private}'.format(private=private, **pub)
+                for pub in public
+            ]
 
-        return ', '.join(format_port(*item)
-                         for item in sorted(six.iteritems(self.ports)))
+        return ', '.join(
+            ','.join(format_port(*item))
+            for item in sorted(six.iteritems(self.ports))
+        )
 
     @property
     def labels(self):

script/run/run.sh

@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.14.0-rc2"
+VERSION="1.14.0"
 IMAGE="docker/compose:$VERSION"
 
 

tests/unit/config/config_test.py

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