tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 21:24:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2016 from mnowster/remove-unique-constraint-for-command

Browse Source 
Remove uniqueness constraint for command
This commit is contained in:
Aanand Prasad 2015-09-09 10:05:41 -07:00
commit 9ce30e75df
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compose/config/fields_schema.json
View File

@ -17,7 +17,12 @@
"build": {"type": "string"}, "build": {"type": "string"},
"cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true}, "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
"cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true}, "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
"command": {"$ref": "#/definitions/string_or_list"}, "command": {
"oneOf": [
{"type": "string"},
{"type": "array", "items": {"type": "string"}}
]
},
"container_name": {"type": "string"}, "container_name": {"type": "string"},
"cpu_shares": { "cpu_shares": {
"oneOf": [ "oneOf": [

2
tests/unit/config_test.py
View File

@ -183,7 +183,7 @@ class ConfigTest(unittest.TestCase):
) )
def test_invalid_list_of_strings_format(self): def test_invalid_list_of_strings_format(self):
expected_error_msg = "'command' contains an invalid type, valid types are string or list of strings" expected_error_msg = "'command' contains an invalid type, valid types are string or array"
with self.assertRaisesRegexp(ConfigurationError, expected_error_msg): with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
config.load( config.load(
config.ConfigDetails( config.ConfigDetails(