beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/compose/schema/bindata.go
View file

File diff suppressed because one or more lines are too long

22
cli/compose/schema/data/config_schema_v3.1.json
View file

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