From fffcc05a8e2c8115991d456992b928b804199157 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 11 Dec 2017 11:03:19 -0800
Subject: [PATCH] Add stop_grace_period to ALLOWED_KEYS

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

diff --git a/compose/config/config.py b/compose/config/config.py
index 51391fc7b..95c12d1cc 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -126,6 +126,7 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
     'network_mode',
     'init',
     'scale',
+    'stop_grace_period',
 ]
 
 DOCKER_VALID_URL_PREFIXES = (
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 122ab2ef9..e16e4bfa1 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1150,7 +1150,8 @@ class ConfigTest(unittest.TestCase):
                         'volumes': [
                             {'source': '/a', 'target': '/b', 'type': 'bind'},
                             {'source': 'vol', 'target': '/x', 'type': 'volume', 'read_only': True}
-                        ]
+                        ],
+                        'stop_grace_period': '30s',
                     }
                 },
                 'volumes': {'vol': {}}
@@ -1177,6 +1178,7 @@ class ConfigTest(unittest.TestCase):
                 '/c:/b:rw',
                 {'source': 'vol', 'target': '/x', 'type': 'volume', 'read_only': True}
             ]
+        assert service_dicts[0]['stop_grace_period'] == '30s'
 
     @mock.patch.dict(os.environ)
     def test_volume_mode_override(self):