From f4efa293779e7b6a39fef2aab6ebad1b337007bc Mon Sep 17 00:00:00 2001
From: Mohit Soni <mosoni@paypal.com>
Date: Wed, 30 Sep 2015 00:25:26 -0700
Subject: [PATCH] Added support for cgroup_parent

This change adds cgroup-parent support to compose project. It allows
each service to specify a 'cgroup_parent' option.

Signed-off-by: Mohit Soni <mosoni@paypal.com>
---
 compose/config/config.py          | 1 +
 compose/config/fields_schema.json | 1 +
 compose/service.py                | 5 ++++-
 docs/compose-file.md              | 6 ++++++
 tests/unit/service_test.py        | 7 +++++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 9e9cb857f..1a995fa8e 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -21,6 +21,7 @@ from .validation import validate_top_level_object
 DOCKER_CONFIG_KEYS = [
     'cap_add',
     'cap_drop',
+    'cgroup_parent',
     'command',
     'cpu_shares',
     'cpuset',
diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 6fce299cb..da67774fd 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -17,6 +17,7 @@
         "build": {"type": "string"},
         "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "cgroup_parent": {"type": "string"},
         "command": {
           "oneOf": [
             {"type": "string"},
diff --git a/compose/service.py b/compose/service.py
index 044b34ad5..0d89afc02 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -41,6 +41,7 @@ log = logging.getLogger(__name__)
 DOCKER_START_KEYS = [
     'cap_add',
     'cap_drop',
+    'cgroup_parent',
     'devices',
     'dns',
     'dns_search',
@@ -675,6 +676,7 @@ class Service(object):
         read_only = options.get('read_only', None)
 
         devices = options.get('devices', None)
+        cgroup_parent = options.get('cgroup_parent', None)
 
         return self.client.create_host_config(
             links=self._get_links(link_to_self=one_off),
@@ -696,7 +698,8 @@ class Service(object):
             read_only=read_only,
             pid_mode=pid,
             security_opt=security_opt,
-            ipc_mode=options.get('ipc')
+            ipc_mode=options.get('ipc'),
+            cgroup_parent=cgroup_parent
         )
 
     def build(self, no_cache=False, pull=False):
diff --git a/docs/compose-file.md b/docs/compose-file.md
index 725130f78..67322335a 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -56,6 +56,12 @@ Override the default command.
 
     command: bundle exec thin -p 3000
 
+### cgroup_parent
+
+Specify an optional parent cgroup for the container.
+
+    cgroup_parent: m-executor-abcd
+
 ### container_name
 
 Specify a custom container name, rather than a generated default name.
diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
index 19d25e2ed..15a9b7c03 100644
--- a/tests/unit/service_test.py
+++ b/tests/unit/service_test.py
@@ -353,6 +353,13 @@ class ServiceTest(unittest.TestCase):
         service.create_container(do_build=False)
         self.assertFalse(self.mock_client.build.called)
 
+    def test_create_container_no_build_cgroup_parent(self):
+        service = Service('foo', client=self.mock_client, build='.')
+        service.image = lambda: {'Id': 'abc123'}
+
+        service.create_container(do_build=False, cgroup_parent='test')
+        self.assertFalse(self.mock_client.build.called)
+
     def test_create_container_no_build_but_needs_build(self):
         service = Service('foo', client=self.mock_client, build='.')
         service.image = lambda *args, **kwargs: mock_get_image([])