Browse Source

Allow Entrypoints to be Lists

Signed-off-by: Michael A. Smith <[email protected]>
Michael A. Smith 9 years ago
parent
commit
59a4ab9634
2 changed files with 12 additions and 2 deletions
  1. 6 1
      compose/config/service_schema_v1.json
  2. 6 1
      compose/config/service_schema_v2.json

+ 6 - 1
compose/config/service_schema_v1.json

@@ -34,7 +34,12 @@
         "dns_search": {"$ref": "#/definitions/string_or_list"},
         "dns_search": {"$ref": "#/definitions/string_or_list"},
         "dockerfile": {"type": "string"},
         "dockerfile": {"type": "string"},
         "domainname": {"type": "string"},
         "domainname": {"type": "string"},
-        "entrypoint": {"$ref": "#/definitions/string_or_list"},
+        "entrypoint": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
         "env_file": {"$ref": "#/definitions/string_or_list"},
         "env_file": {"$ref": "#/definitions/string_or_list"},
         "environment": {"$ref": "#/definitions/list_or_dict"},
         "environment": {"$ref": "#/definitions/list_or_dict"},
 
 

+ 6 - 1
compose/config/service_schema_v2.json

@@ -34,7 +34,12 @@
         "dns_search": {"$ref": "#/definitions/string_or_list"},
         "dns_search": {"$ref": "#/definitions/string_or_list"},
         "dockerfile": {"type": "string"},
         "dockerfile": {"type": "string"},
         "domainname": {"type": "string"},
         "domainname": {"type": "string"},
-        "entrypoint": {"$ref": "#/definitions/string_or_list"},
+        "entrypoint": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "array", "items": {"type": "string"}}
+          ]
+        },
         "env_file": {"$ref": "#/definitions/string_or_list"},
         "env_file": {"$ref": "#/definitions/string_or_list"},
         "environment": {"$ref": "#/definitions/list_or_dict"},
         "environment": {"$ref": "#/definitions/list_or_dict"},