diff options
| author | Joffrey F <joffrey@docker.com> | 2017-09-26 17:19:29 -0700 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2017-10-17 17:20:00 -0700 |
| commit | 78fe655dbce206e3e6e64ce3e62af94267782487 (patch) | |
| tree | 187452e537aa77f123c8a4e5e0cb8828bcd668f2 | |
| parent | cb2d65556b316b58debeb6e5f5ccc3010d0171d7 (diff) | |
Revert 3.4-beta temp rename
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | compose/config/config_schema_v3.4.json (renamed from compose/config/config_schema_v3.4-beta.json) | 8 | ||||
| -rw-r--r-- | compose/const.py | 2 | ||||
| -rw-r--r-- | docker-compose.spec | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/compose/config/config_schema_v3.4-beta.json b/compose/config/config_schema_v3.4.json index cba06320..dae7d7d2 100644 --- a/compose/config/config_schema_v3.4-beta.json +++ b/compose/config/config_schema_v3.4.json @@ -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": { diff --git a/compose/const.py b/compose/const.py index 809f7c7d..b5970f82 100644 --- a/compose/const.py +++ b/compose/const.py @@ -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', diff --git a/docker-compose.spec b/docker-compose.spec index fe5651f6..9c46421f 100644 --- a/docker-compose.spec +++ b/docker-compose.spec @@ -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' ), ( |