From 7e8958e6cab8edbfabd732e29a1c01b375a8bc02 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 1 Feb 2017 15:43:20 -0800
Subject: [PATCH] Add missing comma in DOCKER_CONFIG_KEYS list

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py         |  2 +-
 tests/unit/config/config_test.py | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 0e8b52e79..746f63d53 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -78,7 +78,7 @@ DOCKER_CONFIG_KEYS = [
     'memswap_limit',
     'mem_swappiness',
     'net',
-    'oom_score_adj'
+    'oom_score_adj',
     'pid',
     'ports',
     'privileged',
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index d7947a4e8..860e58353 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1748,6 +1748,24 @@ class ConfigTest(unittest.TestCase):
             }
         }
 
+    def test_merge_pid(self):
+        # Regression: https://github.com/docker/compose/issues/4184
+        base = {
+            'image': 'busybox',
+            'pid': 'host'
+        }
+
+        override = {
+            'labels': {'com.docker.compose.test': 'yes'}
+        }
+
+        actual = config.merge_service_dicts(base, override, V2_0)
+        assert actual == {
+            'image': 'busybox',
+            'pid': 'host',
+            'labels': {'com.docker.compose.test': 'yes'}
+        }
+
     def test_external_volume_config(self):
         config_details = build_config_details({
             'version': '2',