Merge pull request #4066 from shin-/fix-schema-divergence

Fix schema divergence - add missing fields to compose 2.1 schema
This commit is contained in:
Aanand Prasad 2016-10-25 11:20:51 -07:00 committed by GitHub
commit 505c785c5c

View File

@ -140,6 +140,7 @@
"mac_address": {"type": "string"}, "mac_address": {"type": "string"},
"mem_limit": {"type": ["number", "string"]}, "mem_limit": {"type": ["number", "string"]},
"memswap_limit": {"type": ["number", "string"]}, "memswap_limit": {"type": ["number", "string"]},
"mem_swappiness": {"type": "integer"},
"network_mode": {"type": "string"}, "network_mode": {"type": "string"},
"networks": { "networks": {
@ -168,6 +169,14 @@
} }
] ]
}, },
"oom_score_adj": {"type": "integer", "minimum": -1000, "maximum": 1000},
"group_add": {
"type": "array",
"items": {
"type": ["string", "number"]
},
"uniqueItems": true
},
"pid": {"type": ["string", "null"]}, "pid": {"type": ["string", "null"]},
"ports": { "ports": {
@ -248,6 +257,7 @@
}, },
"additionalProperties": false "additionalProperties": false
}, },
"internal": {"type": "boolean"},
"enable_ipv6": {"type": "boolean"}, "enable_ipv6": {"type": "boolean"},
"labels": {"$ref": "#/definitions/list_or_dict"} "labels": {"$ref": "#/definitions/list_or_dict"}
}, },