Rebase Compose v3.1 schema on the latest v3 schema.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit b4f23bbc69)
Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Daniel Nephin 2017-01-20 17:06:35 -05:00 committed by Victor Vieux
parent 6b70c68a7c
commit c19f50acef
2 changed files with 13 additions and 11 deletions

File diff suppressed because one or more lines are too long

View file

@ -198,8 +198,8 @@
},
"sysctls": {"$ref": "#/definitions/list_or_dict"},
"stdin_open": {"type": "boolean"},
"stop_signal": {"type": "string"},
"stop_grace_period": {"type": "string", "format": "duration"},
"stop_signal": {"type": "string"},
"tmpfs": {"$ref": "#/definitions/string_or_list"},
"tty": {"type": "boolean"},
"ulimits": {
@ -231,10 +231,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": [
@ -242,9 +243,8 @@
{"type": "array", "items": {"type": "string"}}
]
},
"disable": {"type": "boolean"}
},
"additionalProperties": false
"timeout": {"type": "string"}
}
},
"deployment": {
"id": "#/definitions/deployment",
@ -337,6 +337,7 @@
},
"additionalProperties": false
},
"internal": {"type": "boolean"},
"labels": {"$ref": "#/definitions/list_or_dict"}
},
"additionalProperties": false
@ -357,10 +358,11 @@
"type": ["boolean", "object"],
"properties": {
"name": {"type": "string"}
}
}
},
"additionalProperties": false
},
"labels": {"$ref": "#/definitions/list_or_dict"}
},
"labels": {"$ref": "#/definitions/list_or_dict"},
"additionalProperties": false
},