From 842e372258809b0be035a7857f8577e33850cca7 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 17 May 2016 15:02:29 -0700
Subject: [PATCH 1/2] Eliminate duplicates when merging port mappings from
 config files

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py          |  6 +++++-
 tests/integration/project_test.py | 36 +++++++++++++++++++++++++++++++
 tests/unit/config/config_test.py  |  8 +++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 6cfce5da41..e1466f060d 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -744,6 +744,7 @@ def merge_service_dicts(base, override, version):
     md.merge_mapping('ulimits', parse_ulimits)
     md.merge_mapping('networks', parse_networks)
     md.merge_sequence('links', ServiceLink.parse)
+    md.merge_field('ports', merge_port_mappings, default=[])
 
     for field in ['volumes', 'devices']:
         md.merge_field(field, merge_path_mappings)
@@ -752,7 +753,6 @@ def merge_service_dicts(base, override, version):
         'depends_on',
         'expose',
         'external_links',
-        'ports',
         'volumes_from',
     ]:
         md.merge_field(field, operator.add, default=[])
@@ -771,6 +771,10 @@ def merge_service_dicts(base, override, version):
     return dict(md)
 
 
+def merge_port_mappings(base, override):
+    return list(set().union(base, override))
+
+
 def merge_build(output, base, override):
     def to_dict(service):
         build_config = service.get('build', {})
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 7ef492a561..6e82e931f8 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -834,6 +834,42 @@ class ProjectTest(DockerClientTestCase):
         self.assertTrue(log_config)
         self.assertEqual(log_config.get('Type'), 'none')
 
+    @v2_only()
+    def test_project_up_port_mappings_with_multiple_files(self):
+        base_file = config.ConfigFile(
+            'base.yml',
+            {
+                'version': V2_0,
+                'services': {
+                    'simple': {
+                        'image': 'busybox:latest',
+                        'command': 'top',
+                        'ports': ['1234:1234']
+                    },
+                },
+
+            })
+        override_file = config.ConfigFile(
+            'override.yml',
+            {
+                'version': V2_0,
+                'services': {
+                    'simple': {
+                        'ports': ['1234:1234']
+                    }
+                }
+
+            })
+        details = config.ConfigDetails('.', [base_file, override_file])
+
+        config_data = config.load(details)
+        project = Project.from_config(
+            name='composetest', config_data=config_data, client=self.client
+        )
+        project.up()
+        containers = project.containers()
+        self.assertEqual(len(containers), 1)
+
     @v2_only()
     def test_initialize_volumes(self):
         vol_name = '{0:x}'.format(random.getrandbits(32))
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index ccb3bcfe17..24ece49946 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1912,6 +1912,14 @@ class MergePortsTest(unittest.TestCase, MergeListsTest):
     base_config = ['10:8000', '9000']
     override_config = ['20:8000']
 
+    def test_duplicate_port_mappings(self):
+        service_dict = config.merge_service_dicts(
+            {self.config_name: self.base_config},
+            {self.config_name: self.base_config},
+            DEFAULT_VERSION
+        )
+        assert set(service_dict[self.config_name]) == set(self.base_config)
+
 
 class MergeNetworksTest(unittest.TestCase, MergeListsTest):
     config_name = 'networks'

From c4229b469a7fdf37b84fdd7b911508936f442363 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 19 May 2016 15:42:37 -0700
Subject: [PATCH 2/2] Improve merging for several service config attributes

All uniqueItems lists in the config now receive the same treatment removing
duplicates.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index e1466f060d..97c427b919 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -4,7 +4,6 @@ from __future__ import unicode_literals
 import functools
 import logging
 import ntpath
-import operator
 import os
 import string
 import sys
@@ -744,18 +743,15 @@ def merge_service_dicts(base, override, version):
     md.merge_mapping('ulimits', parse_ulimits)
     md.merge_mapping('networks', parse_networks)
     md.merge_sequence('links', ServiceLink.parse)
-    md.merge_field('ports', merge_port_mappings, default=[])
 
     for field in ['volumes', 'devices']:
         md.merge_field(field, merge_path_mappings)
 
     for field in [
-        'depends_on',
-        'expose',
-        'external_links',
-        'volumes_from',
+        'ports', 'cap_add', 'cap_drop', 'expose', 'external_links',
+        'security_opt', 'volumes_from', 'depends_on',
     ]:
-        md.merge_field(field, operator.add, default=[])
+        md.merge_field(field, merge_unique_items_lists, default=[])
 
     for field in ['dns', 'dns_search', 'env_file', 'tmpfs']:
         md.merge_field(field, merge_list_or_string)
@@ -771,8 +767,8 @@ def merge_service_dicts(base, override, version):
     return dict(md)
 
 
-def merge_port_mappings(base, override):
-    return list(set().union(base, override))
+def merge_unique_items_lists(base, override):
+    return sorted(set().union(base, override))
 
 
 def merge_build(output, base, override):