瀏覽代碼

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

Remove uniqueness constraint for command
Aanand Prasad 10 年之前
父節點
當前提交
9ce30e75df
共有 2 個文件被更改,包括 7 次插入2 次删除
  1. 6 1
      compose/config/fields_schema.json
  2. 1 1
      tests/unit/config_test.py

+ 6 - 1
compose/config/fields_schema.json

@@ -17,7 +17,12 @@
         "build": {"type": "string"},
         "cap_add": {"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"},
         "cpu_shares": {
           "oneOf": [

+ 1 - 1
tests/unit/config_test.py

@@ -183,7 +183,7 @@ class ConfigTest(unittest.TestCase):
             )
 
     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):
             config.load(
                 config.ConfigDetails(