From be554c3a74c137e835209b7a1f27b76bd64aa54f Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 5 Feb 2016 20:21:58 -0500
Subject: [PATCH] Merge v1 config jsonschemas into a single file.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 ...e_schema_v1.json => config_schema_v1.json} | 44 +++++++++++--------
 compose/config/fields_schema_v1.json          | 13 ------
 compose/config/validation.py                  |  2 +-
 docker-compose.spec                           |  9 +---
 4 files changed, 28 insertions(+), 40 deletions(-)
 rename compose/config/{service_schema_v1.json => config_schema_v1.json} (89%)
 delete mode 100644 compose/config/fields_schema_v1.json

diff --git a/compose/config/service_schema_v1.json b/compose/config/config_schema_v1.json
similarity index 89%
rename from compose/config/service_schema_v1.json
rename to compose/config/config_schema_v1.json
index 4d974d710..affc19f0f 100644
--- a/compose/config/service_schema_v1.json
+++ b/compose/config/config_schema_v1.json
@@ -1,13 +1,16 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "service_schema_v1.json",
+  "id": "config_schema_v1.json",
 
   "type": "object",
 
-  "allOf": [
-    {"$ref": "#/definitions/service"},
-    {"$ref": "#/definitions/constraints"}
-  ],
+  "patternProperties": {
+    "^[a-zA-Z0-9._-]+$": {
+      "$ref": "#/definitions/service"
+    }
+  },
+
+  "additionalProperties": false,
 
   "definitions": {
     "service": {
@@ -162,21 +165,24 @@
         {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
       ]
     },
+
     "constraints": {
-      "id": "#/definitions/constraints",
-      "anyOf": [
-        {
-          "required": ["build"],
-          "not": {"required": ["image"]}
-        },
-        {
-          "required": ["image"],
-          "not": {"anyOf": [
-            {"required": ["build"]},
-            {"required": ["dockerfile"]}
-          ]}
-        }
-      ]
+      "services": {
+        "id": "#/definitions/services/constraints",
+        "anyOf": [
+          {
+            "required": ["build"],
+            "not": {"required": ["image"]}
+          },
+          {
+            "required": ["image"],
+            "not": {"anyOf": [
+              {"required": ["build"]},
+              {"required": ["dockerfile"]}
+            ]}
+          }
+        ]
+      }
     }
   }
 }
diff --git a/compose/config/fields_schema_v1.json b/compose/config/fields_schema_v1.json
deleted file mode 100644
index 8f6a8c0ad..000000000
--- a/compose/config/fields_schema_v1.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-
-  "type": "object",
-  "id": "fields_schema_v1.json",
-
-  "patternProperties": {
-    "^[a-zA-Z0-9._-]+$": {
-      "$ref": "service_schema_v1.json#/definitions/service"
-    }
-  },
-  "additionalProperties": false
-}
diff --git a/compose/config/validation.py b/compose/config/validation.py
index d7ca270ca..07ec04ef7 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -388,7 +388,7 @@ def process_errors(errors, path_prefix=None):
 def validate_against_config_schema(config_file):
     _validate_against_schema(
         config_file.config,
-        "service_schema_v{0}.json".format(config_file.version),
+        "config_schema_v{0}.json".format(config_file.version),
         format_checker=["ports", "expose", "bool-value-in-mapping"],
         filename=config_file.filename)
 
diff --git a/docker-compose.spec b/docker-compose.spec
index 4282400ed..3a165dd67 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -18,13 +18,8 @@ exe = EXE(pyz,
           a.datas,
           [
             (
-                'compose/config/fields_schema_v1.json',
-                'compose/config/fields_schema_v1.json',
-                'DATA'
-            ),
-            (
-                'compose/config/service_schema_v1.json',
-                'compose/config/service_schema_v1.json',
+                'compose/config/config_schema_v1.json',
+                'compose/config/config_schema_v1.json',
                 'DATA'
             ),
             (