mirror of https://github.com/docker/compose.git
Revert 3.4-beta temp rename
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
parent
b2a03265e4
commit
7f82a28572
|
@ -1,6 +1,7 @@
|
|||
|
||||
{
|
||||
"$schema": "http://json-schema.org/draft-04/schema#",
|
||||
"id": "config_schema_v3.4-beta.json",
|
||||
"id": "config_schema_v3.4.json",
|
||||
"type": "object",
|
||||
"required": ["version"],
|
||||
|
||||
|
@ -316,7 +317,7 @@
|
|||
"additionalProperties": false,
|
||||
"properties": {
|
||||
"disable": {"type": "boolean"},
|
||||
"interval": {"type": "string"},
|
||||
"interval": {"type": "string", "format": "duration"},
|
||||
"retries": {"type": "number"},
|
||||
"test": {
|
||||
"oneOf": [
|
||||
|
@ -324,7 +325,8 @@
|
|||
{"type": "array", "items": {"type": "string"}}
|
||||
]
|
||||
},
|
||||
"timeout": {"type": "string"}
|
||||
"timeout": {"type": "string", "format": "duration"},
|
||||
"start_period": {"type": "string", "format": "duration"}
|
||||
}
|
||||
},
|
||||
"deployment": {
|
|
@ -31,7 +31,7 @@ COMPOSEFILE_V3_0 = ComposeVersion('3.0')
|
|||
COMPOSEFILE_V3_1 = ComposeVersion('3.1')
|
||||
COMPOSEFILE_V3_2 = ComposeVersion('3.2')
|
||||
COMPOSEFILE_V3_3 = ComposeVersion('3.3')
|
||||
COMPOSEFILE_V3_4 = ComposeVersion('3.4-beta')
|
||||
COMPOSEFILE_V3_4 = ComposeVersion('3.4')
|
||||
|
||||
API_VERSIONS = {
|
||||
COMPOSEFILE_V1: '1.21',
|
||||
|
|
|
@ -63,8 +63,8 @@ exe = EXE(pyz,
|
|||
'DATA'
|
||||
),
|
||||
(
|
||||
'compose/config/config_schema_v3.4-beta.json',
|
||||
'compose/config/config_schema_v3.4-beta.json',
|
||||
'compose/config/config_schema_v3.4.json',
|
||||
'compose/config/config_schema_v3.4.json',
|
||||
'DATA'
|
||||
),
|
||||
(
|
||||
|
|
Loading…
Reference in New Issue