From 32cd404c8c1bb31d04aa2845ca7fa15deae9b00b Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Tue, 8 Sep 2015 11:54:03 +0100
Subject: [PATCH] Remove redundant oneOf definitions

For simple definitions where a field can be multiple types, we can
specify the allowed types in an array. It's simpler and clearer.

This is only applicable to *simple* definitions, like number, string, list,
object without any other constraints.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/fields_schema.json | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/compose/config/fields_schema.json b/compose/config/fields_schema.json
index 5c7322517..6277b57d6 100644
--- a/compose/config/fields_schema.json
+++ b/compose/config/fields_schema.json
@@ -24,12 +24,7 @@
           ]
         },
         "container_name": {"type": "string"},
-        "cpu_shares": {
-          "oneOf": [
-            {"type": "number"},
-            {"type": "string"}
-          ]
-        },
+        "cpu_shares": {"type": ["number", "string"]},
         "cpuset": {"type": "string"},
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "dns": {"$ref": "#/definitions/string_or_list"},
@@ -74,18 +69,8 @@
         "log_opt": {"type": "object"},
 
         "mac_address": {"type": "string"},
-        "mem_limit": {
-          "oneOf": [
-            {"type": "number"},
-            {"type": "string"}
-          ]
-        },
-        "memswap_limit": {
-          "oneOf": [
-            {"type": "number"},
-            {"type": "string"}
-          ]
-        },
+        "mem_limit": {"type": ["number", "string"]},
+        "memswap_limit": {"type": ["number", "string"]},
         "name": {"type": "string"},
         "net": {"type": "string"},
         "pid": {"type": ["string", "null"]},