From 8145429399346a8d800369aad17f5fe69237c2ad Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 4 Jan 2017 13:14:23 -0800
Subject: [PATCH] Unify healthcheck spec definition in v2 and v3

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py               |  2 +-
 compose/config/config_schema_v2.1.json |  2 +-
 compose/config/config_schema_v3.0.json | 12 ++++++------
 tests/integration/project_test.py      |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index 73a340172..fd935591f 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -675,7 +675,7 @@ def process_healthcheck(service_dict, service_name):
     hc = {}
     raw = service_dict['healthcheck']
 
-    if raw.get('disable') or raw.get('disabled'):
+    if raw.get('disable'):
         if len(raw) > 1:
             raise ConfigurationError(
                 'Service "{}" defines an invalid healthcheck: '
diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index 5ab9f71fb..d0d5233a5 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -258,7 +258,7 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "disabled": {"type": "boolean"},
+        "disable": {"type": "boolean"},
         "interval": {"type": "string"},
         "retries": {"type": "number"},
         "test": {
diff --git a/compose/config/config_schema_v3.0.json b/compose/config/config_schema_v3.0.json
index 1f93347f9..8d075d47a 100644
--- a/compose/config/config_schema_v3.0.json
+++ b/compose/config/config_schema_v3.0.json
@@ -202,10 +202,11 @@
 
     "healthcheck": {
       "id": "#/definitions/healthcheck",
-      "type": ["object", "null"],
+      "type": "object",
+      "additionalProperties": false,
       "properties": {
-        "interval": {"type":"string"},
-        "timeout": {"type":"string"},
+        "disable": {"type": "boolean"},
+        "interval": {"type": "string"},
         "retries": {"type": "number"},
         "test": {
           "oneOf": [
@@ -213,9 +214,8 @@
             {"type": "array", "items": {"type": "string"}}
           ]
         },
-        "disable": {"type": "boolean"}
-      },
-      "additionalProperties": false
+        "timeout": {"type": "string"}
+      }
     },
     "deployment": {
       "id": "#/definitions/deployment",
diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 855974de1..c5e3cf50f 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -1463,7 +1463,7 @@ class ProjectTest(DockerClientTestCase):
                     'image': 'busybox:latest',
                     'command': 'top',
                     'healthcheck': {
-                        'disabled': True
+                        'disable': True
                     },
                 },
                 'svc2': {