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 #5418 from nginth/5352-fix-volume-config 

Add config validation for service volumes, fixes #5352
This commit is contained in:
Joffrey F 2017-12-01 12:19:23 -08:00 committed by GitHub
parent 8bc6334ba5 bee6046043
commit 43fc651364
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compose/config/config_schema_v3.2.json
View File

@ -244,6 +244,7 @@
{
"type": "object",
"required": ["type"],
"additionalProperties": false,
"properties": {
"type": {"type": "string"},
"source": {"type": "string"},

1
compose/config/config_schema_v3.3.json
View File

@ -278,6 +278,7 @@
{
"type": "object",
"required": ["type"],
"additionalProperties": false,
"properties": {
"type": {"type": "string"},
"source": {"type": "string"},

1
compose/config/config_schema_v3.4.json
View File

@ -282,6 +282,7 @@
{
"type": "object",
"required": ["type"],
"additionalProperties": false,
"properties": {
"type": {"type": "string"},
"source": {"type": "string"},

1
compose/config/config_schema_v3.5.json
View File

@ -281,6 +281,7 @@
{
"type": "object",
"required": ["type"],
"additionalProperties": false,
"properties": {
"type": {"type": "string"},
"source": {"type": "string"},

27
tests/unit/config/config_test.py
View File

@ -2631,6 +2631,33 @@ class ConfigTest(unittest.TestCase):
]
assert service_sort(service_dicts) == service_sort(expected)
def test_service_volume_invalid_config(self):
config_details = build_config_details(
{
'version': '3.2',
'services': {
'web': {
'build': {
'context': '.',
'args': None,
},
'volumes': [
{
"type": "volume",
"source": "/data",
"garbage": {
"and": "error"
}
}
]
},
},
}
)
with pytest.raises(ConfigurationError) as exc:
config.load(config_details)
assert "services.web.volumes contains unsupported option: 'garbage'" in exc.exconly()
class NetworkModeTest(unittest.TestCase):