tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4696 from docker/4694-include_3.2_format_in_binary 

Add 3.2 schema to docker-compose.spec
This commit is contained in:
Joffrey F 2017-04-03 12:43:33 -07:00 committed by GitHub
parent 2506b72508 65b919cf08
commit e2f6f0122e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/config/errors.py
View File

@ -4,8 +4,8 @@ from __future__ import unicode_literals
VERSION_EXPLANATION = (
'You might be seeing this error because you\'re using the wrong Compose file version. '
'Either specify a supported version ("2.0", "2.1", "3.0", "3.1") and place your '
'service definitions under the `services` key, or omit the `version` key '
'Either specify a supported version ("2.0", "2.1", "3.0", "3.1", "3.2") and place '
'your service definitions under the `services` key, or omit the `version` key '
'and place your service definitions at the root of the file to use '
'version 1.\nFor more on the Compose file format versions, see '
'https://docs.docker.com/compose/compose-file/')

5
docker-compose.spec
View File

@ -42,6 +42,11 @@ exe = EXE(pyz,
'compose/config/config_schema_v3.1.json',
'DATA'
),
(
'compose/config/config_schema_v3.2.json',
'compose/config/config_schema_v3.2.json',
'DATA'
),
(
'compose/GITSHA',
'compose/GITSHA',