From fb165d9c1505e2505f637cb2cede77e4d0731884 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 16 Dec 2016 12:21:59 -0800
Subject: [PATCH 1/2] Add v3_only marker to healthcheck test

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/acceptance/cli_test.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 856b8f93c..2d0ce7155 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -316,8 +316,8 @@ class CLITestCase(DockerClientTestCase):
                                 'memory': '50M',
                             },
                             'reservations': {
-                                    'cpus': '0.0001',
-                                    'memory': '20M',
+                                'cpus': '0.0001',
+                                'memory': '20M',
                             },
                         },
                         'restart_policy': {
@@ -928,6 +928,7 @@ class CLITestCase(DockerClientTestCase):
         assert foo_container.get('HostConfig.NetworkMode') == \
             'container:{}'.format(bar_container.id)
 
+    @v3_only()
     def test_up_with_healthcheck(self):
         def wait_on_health_status(container, status):
             def condition():
@@ -945,7 +946,7 @@ class CLITestCase(DockerClientTestCase):
         assert passes_container.get('Config.Healthcheck') == {
             "Test": ["CMD-SHELL", "/bin/true"],
             "Interval": nanoseconds_from_time_seconds(1),
-            "Timeout": nanoseconds_from_time_seconds(30*60),
+            "Timeout": nanoseconds_from_time_seconds(30 * 60),
             "Retries": 1,
         }
 

From e736151ee497a65df4e7e271ebd059731e250760 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 5 Dec 2016 16:11:21 -0800
Subject: [PATCH 2/2] Make created networks attachable for file format >=2.1

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/network.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compose/network.py b/compose/network.py
index 8a29b73e2..eb76e2920 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -6,6 +6,7 @@ import logging
 from docker.errors import NotFound
 from docker.types import IPAMConfig
 from docker.types import IPAMPool
+from docker.utils import version_gte
 
 from .config import ConfigurationError
 
@@ -72,6 +73,7 @@ class Network(object):
                 internal=self.internal,
                 enable_ipv6=self.enable_ipv6,
                 labels=self.labels,
+                attachable=version_gte(self.client._version, '1.24') or None
             )
 
     def remove(self):