diff --git a/compose/config/config.py b/compose/config/config.py
index 0012aefd7..0e7942595 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -287,7 +287,7 @@ def load_services(working_dir, config_files, version):
service_dict = process_service(resolver.run())
# TODO: move to validate_service()
- validate_against_service_schema(service_dict, service_config.name)
+ validate_against_service_schema(service_dict, service_config.name, version)
validate_paths(service_dict)
service_dict = finalize_service(service_config._replace(config=service_dict))
diff --git a/compose/config/fields_schema_v1.json b/compose/config/fields_schema_v1.json
index 790ace349..8f6a8c0ad 100644
--- a/compose/config/fields_schema_v1.json
+++ b/compose/config/fields_schema_v1.json
@@ -6,165 +6,8 @@
"patternProperties": {
"^[a-zA-Z0-9._-]+$": {
- "$ref": "#/definitions/service"
+ "$ref": "service_schema_v1.json#/definitions/service"
}
},
- "additionalProperties": false,
-
- "definitions": {
- "service": {
- "id": "#/definitions/service",
- "type": "object",
-
- "properties": {
- "build": {"type": "string"},
- "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
- "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
- "cgroup_parent": {"type": "string"},
- "command": {
- "oneOf": [
- {"type": "string"},
- {"type": "array", "items": {"type": "string"}}
- ]
- },
- "container_name": {"type": "string"},
- "cpu_shares": {"type": ["number", "string"]},
- "cpu_quota": {"type": ["number", "string"]},
- "cpuset": {"type": "string"},
- "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
- "dns": {"$ref": "#/definitions/string_or_list"},
- "dns_search": {"$ref": "#/definitions/string_or_list"},
- "dockerfile": {"type": "string"},
- "domainname": {"type": "string"},
- "entrypoint": {"$ref": "#/definitions/string_or_list"},
- "env_file": {"$ref": "#/definitions/string_or_list"},
- "environment": {"$ref": "#/definitions/list_or_dict"},
-
- "expose": {
- "type": "array",
- "items": {
- "type": ["string", "number"],
- "format": "expose"
- },
- "uniqueItems": true
- },
-
- "extends": {
- "oneOf": [
- {
- "type": "string"
- },
- {
- "type": "object",
-
- "properties": {
- "service": {"type": "string"},
- "file": {"type": "string"}
- },
- "required": ["service"],
- "additionalProperties": false
- }
- ]
- },
-
- "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
- "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
- "hostname": {"type": "string"},
- "image": {"type": "string"},
- "ipc": {"type": "string"},
- "labels": {"$ref": "#/definitions/list_or_dict"},
- "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-
- "logging": {
- "type": "object",
-
- "properties": {
- "driver": {"type": "string"},
- "options": {"type": "object"}
- },
- "additionalProperties": false
- },
-
- "mac_address": {"type": "string"},
- "mem_limit": {"type": ["number", "string"]},
- "memswap_limit": {"type": ["number", "string"]},
- "net": {"type": "string"},
- "pid": {"type": ["string", "null"]},
-
- "ports": {
- "type": "array",
- "items": {
- "type": ["string", "number"],
- "format": "ports"
- },
- "uniqueItems": true
- },
-
- "privileged": {"type": "boolean"},
- "read_only": {"type": "boolean"},
- "restart": {"type": "string"},
- "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
- "stdin_open": {"type": "boolean"},
- "tty": {"type": "boolean"},
- "ulimits": {
- "type": "object",
- "patternProperties": {
- "^[a-z]+$": {
- "oneOf": [
- {"type": "integer"},
- {
- "type":"object",
- "properties": {
- "hard": {"type": "integer"},
- "soft": {"type": "integer"}
- },
- "required": ["soft", "hard"],
- "additionalProperties": false
- }
- ]
- }
- }
- },
- "user": {"type": "string"},
- "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
- "volume_driver": {"type": "string"},
- "volumes_from": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
- "working_dir": {"type": "string"}
- },
-
- "dependencies": {
- "memswap_limit": ["mem_limit"]
- },
- "additionalProperties": false
- },
-
- "string_or_list": {
- "oneOf": [
- {"type": "string"},
- {"$ref": "#/definitions/list_of_strings"}
- ]
- },
-
- "list_of_strings": {
- "type": "array",
- "items": {"type": "string"},
- "uniqueItems": true
- },
-
- "list_or_dict": {
- "oneOf": [
- {
- "type": "object",
- "patternProperties": {
- ".+": {
- "type": ["string", "number", "boolean", "null"],
- "format": "bool-value-in-mapping"
- }
- },
- "additionalProperties": false
- },
- {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
- ]
- }
- }
+ "additionalProperties": false
}
diff --git a/compose/config/fields_schema_v2.json b/compose/config/fields_schema_v2.json
index 49cab3670..22ff839fb 100644
--- a/compose/config/fields_schema_v2.json
+++ b/compose/config/fields_schema_v2.json
@@ -12,7 +12,7 @@
"type": "object",
"patternProperties": {
"^[a-zA-Z0-9._-]+$": {
- "$ref": "fields_schema_v1.json#/definitions/service"
+ "$ref": "service_schema_v2.json#/definitions/service"
}
},
"additionalProperties": false
diff --git a/compose/config/service_schema.json b/compose/config/service_schema.json
deleted file mode 100644
index 91a1e0050..000000000
--- a/compose/config/service_schema.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "id": "service_schema.json",
-
- "type": "object",
-
- "allOf": [
- {"$ref": "fields_schema_v1.json#/definitions/service"},
- {"$ref": "#/definitions/constraints"}
- ],
-
- "definitions": {
- "constraints": {
- "id": "#/definitions/constraints",
- "anyOf": [
- {
- "required": ["build"],
- "not": {"required": ["image"]}
- },
- {
- "required": ["image"],
- "not": {"anyOf": [
- {"required": ["build"]},
- {"required": ["dockerfile"]}
- ]}
- }
- ]
- }
- }
-}
diff --git a/compose/config/service_schema_v1.json b/compose/config/service_schema_v1.json
new file mode 100644
index 000000000..d51c7f731
--- /dev/null
+++ b/compose/config/service_schema_v1.json
@@ -0,0 +1,175 @@
+{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "id": "service_schema_v1.json",
+
+ "type": "object",
+
+ "allOf": [
+ {"$ref": "#/definitions/service"},
+ {"$ref": "#/definitions/constraints"}
+ ],
+
+ "definitions": {
+ "service": {
+ "id": "#/definitions/service",
+ "type": "object",
+
+ "properties": {
+ "build": {"type": "string"},
+ "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "cgroup_parent": {"type": "string"},
+ "command": {
+ "oneOf": [
+ {"type": "string"},
+ {"type": "array", "items": {"type": "string"}}
+ ]
+ },
+ "container_name": {"type": "string"},
+ "cpu_shares": {"type": ["number", "string"]},
+ "cpu_quota": {"type": ["number", "string"]},
+ "cpuset": {"type": "string"},
+ "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "dns": {"$ref": "#/definitions/string_or_list"},
+ "dns_search": {"$ref": "#/definitions/string_or_list"},
+ "dockerfile": {"type": "string"},
+ "domainname": {"type": "string"},
+ "entrypoint": {"$ref": "#/definitions/string_or_list"},
+ "env_file": {"$ref": "#/definitions/string_or_list"},
+ "environment": {"$ref": "#/definitions/list_or_dict"},
+
+ "expose": {
+ "type": "array",
+ "items": {
+ "type": ["string", "number"],
+ "format": "expose"
+ },
+ "uniqueItems": true
+ },
+
+ "extends": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "object",
+
+ "properties": {
+ "service": {"type": "string"},
+ "file": {"type": "string"}
+ },
+ "required": ["service"],
+ "additionalProperties": false
+ }
+ ]
+ },
+
+ "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
+ "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "hostname": {"type": "string"},
+ "image": {"type": "string"},
+ "ipc": {"type": "string"},
+ "labels": {"$ref": "#/definitions/list_or_dict"},
+ "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "log_driver": {"type": "string"},
+ "log_opt": {"type": "object"},
+ "mac_address": {"type": "string"},
+ "mem_limit": {"type": ["number", "string"]},
+ "memswap_limit": {"type": ["number", "string"]},
+ "net": {"type": "string"},
+ "pid": {"type": ["string", "null"]},
+
+ "ports": {
+ "type": "array",
+ "items": {
+ "type": ["string", "number"],
+ "format": "ports"
+ },
+ "uniqueItems": true
+ },
+
+ "privileged": {"type": "boolean"},
+ "read_only": {"type": "boolean"},
+ "restart": {"type": "string"},
+ "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "stdin_open": {"type": "boolean"},
+ "tty": {"type": "boolean"},
+ "ulimits": {
+ "type": "object",
+ "patternProperties": {
+ "^[a-z]+$": {
+ "oneOf": [
+ {"type": "integer"},
+ {
+ "type":"object",
+ "properties": {
+ "hard": {"type": "integer"},
+ "soft": {"type": "integer"}
+ },
+ "required": ["soft", "hard"],
+ "additionalProperties": false
+ }
+ ]
+ }
+ }
+ },
+ "user": {"type": "string"},
+ "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "volume_driver": {"type": "string"},
+ "volumes_from": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "working_dir": {"type": "string"}
+ },
+
+ "dependencies": {
+ "memswap_limit": ["mem_limit"]
+ },
+ "additionalProperties": false
+ },
+
+ "string_or_list": {
+ "oneOf": [
+ {"type": "string"},
+ {"$ref": "#/definitions/list_of_strings"}
+ ]
+ },
+
+ "list_of_strings": {
+ "type": "array",
+ "items": {"type": "string"},
+ "uniqueItems": true
+ },
+
+ "list_or_dict": {
+ "oneOf": [
+ {
+ "type": "object",
+ "patternProperties": {
+ ".+": {
+ "type": ["string", "number", "boolean", "null"],
+ "format": "bool-value-in-mapping"
+ }
+ },
+ "additionalProperties": false
+ },
+ {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
+ ]
+ },
+ "constraints": {
+ "id": "#/definitions/constraints",
+ "anyOf": [
+ {
+ "required": ["build"],
+ "not": {"required": ["image"]}
+ },
+ {
+ "required": ["image"],
+ "not": {"anyOf": [
+ {"required": ["build"]},
+ {"required": ["dockerfile"]}
+ ]}
+ }
+ ]
+ }
+ }
+}
diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
new file mode 100644
index 000000000..a64b3bdc0
--- /dev/null
+++ b/compose/config/service_schema_v2.json
@@ -0,0 +1,184 @@
+{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "id": "service_schema_v2.json",
+
+ "type": "object",
+
+ "allOf": [
+ {"$ref": "#/definitions/service"},
+ {"$ref": "#/definitions/constraints"}
+ ],
+
+ "definitions": {
+ "service": {
+ "id": "#/definitions/service",
+ "type": "object",
+
+ "properties": {
+ "build": {"type": "string"},
+ "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "cgroup_parent": {"type": "string"},
+ "command": {
+ "oneOf": [
+ {"type": "string"},
+ {"type": "array", "items": {"type": "string"}}
+ ]
+ },
+ "container_name": {"type": "string"},
+ "cpu_shares": {"type": ["number", "string"]},
+ "cpu_quota": {"type": ["number", "string"]},
+ "cpuset": {"type": "string"},
+ "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "dns": {"$ref": "#/definitions/string_or_list"},
+ "dns_search": {"$ref": "#/definitions/string_or_list"},
+ "dockerfile": {"type": "string"},
+ "domainname": {"type": "string"},
+ "entrypoint": {"$ref": "#/definitions/string_or_list"},
+ "env_file": {"$ref": "#/definitions/string_or_list"},
+ "environment": {"$ref": "#/definitions/list_or_dict"},
+
+ "expose": {
+ "type": "array",
+ "items": {
+ "type": ["string", "number"],
+ "format": "expose"
+ },
+ "uniqueItems": true
+ },
+
+ "extends": {
+ "oneOf": [
+ {
+ "type": "string"
+ },
+ {
+ "type": "object",
+
+ "properties": {
+ "service": {"type": "string"},
+ "file": {"type": "string"}
+ },
+ "required": ["service"],
+ "additionalProperties": false
+ }
+ ]
+ },
+
+ "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
+ "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "hostname": {"type": "string"},
+ "image": {"type": "string"},
+ "ipc": {"type": "string"},
+ "labels": {"$ref": "#/definitions/list_or_dict"},
+ "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+
+ "logging": {
+ "type": "object",
+
+ "properties": {
+ "driver": {"type": "string"},
+ "options": {"type": "object"}
+ },
+ "additionalProperties": false
+ },
+
+ "mac_address": {"type": "string"},
+ "mem_limit": {"type": ["number", "string"]},
+ "memswap_limit": {"type": ["number", "string"]},
+ "net": {"type": "string"},
+ "pid": {"type": ["string", "null"]},
+
+ "ports": {
+ "type": "array",
+ "items": {
+ "type": ["string", "number"],
+ "format": "ports"
+ },
+ "uniqueItems": true
+ },
+
+ "privileged": {"type": "boolean"},
+ "read_only": {"type": "boolean"},
+ "restart": {"type": "string"},
+ "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "stdin_open": {"type": "boolean"},
+ "tty": {"type": "boolean"},
+ "ulimits": {
+ "type": "object",
+ "patternProperties": {
+ "^[a-z]+$": {
+ "oneOf": [
+ {"type": "integer"},
+ {
+ "type":"object",
+ "properties": {
+ "hard": {"type": "integer"},
+ "soft": {"type": "integer"}
+ },
+ "required": ["soft", "hard"],
+ "additionalProperties": false
+ }
+ ]
+ }
+ }
+ },
+ "user": {"type": "string"},
+ "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "volume_driver": {"type": "string"},
+ "volumes_from": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+ "working_dir": {"type": "string"}
+ },
+
+ "dependencies": {
+ "memswap_limit": ["mem_limit"]
+ },
+ "additionalProperties": false
+ },
+
+ "string_or_list": {
+ "oneOf": [
+ {"type": "string"},
+ {"$ref": "#/definitions/list_of_strings"}
+ ]
+ },
+
+ "list_of_strings": {
+ "type": "array",
+ "items": {"type": "string"},
+ "uniqueItems": true
+ },
+
+ "list_or_dict": {
+ "oneOf": [
+ {
+ "type": "object",
+ "patternProperties": {
+ ".+": {
+ "type": ["string", "number", "boolean", "null"],
+ "format": "bool-value-in-mapping"
+ }
+ },
+ "additionalProperties": false
+ },
+ {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
+ ]
+ },
+ "constraints": {
+ "id": "#/definitions/constraints",
+ "anyOf": [
+ {
+ "required": ["build"],
+ "not": {"required": ["image"]}
+ },
+ {
+ "required": ["image"],
+ "not": {"anyOf": [
+ {"required": ["build"]},
+ {"required": ["dockerfile"]}
+ ]}
+ }
+ ]
+ }
+ }
+}
diff --git a/compose/config/validation.py b/compose/config/validation.py
index 74dd461f3..fea9a22b8 100644
--- a/compose/config/validation.py
+++ b/compose/config/validation.py
@@ -298,10 +298,10 @@ def validate_against_fields_schema(config, filename, version):
filename=filename)
-def validate_against_service_schema(config, service_name):
+def validate_against_service_schema(config, service_name, version):
_validate_against_schema(
config,
- "service_schema.json",
+ "service_schema_v{0}.json".format(version),
format_checker=["ports"],
service_name=service_name)
diff --git a/docker-compose.spec b/docker-compose.spec
index c760d7b4c..f7f2059fd 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -28,8 +28,13 @@ exe = EXE(pyz,
'DATA'
),
(
- 'compose/config/service_schema.json',
- 'compose/config/service_schema.json',
+ 'compose/config/service_schema_v1.json',
+ 'compose/config/service_schema_v1.json',
+ 'DATA'
+ ),
+ (
+ 'compose/config/service_schema_v2.json',
+ 'compose/config/service_schema_v2.json',
'DATA'
),
(
diff --git a/tests/fixtures/logging-composefile/compose2.yml b/tests/fixtures/logging-composefile/compose2.yml
index ba5829691..69889761b 100644
--- a/tests/fixtures/logging-composefile/compose2.yml
+++ b/tests/fixtures/logging-composefile/compose2.yml
@@ -1,3 +1,5 @@
-another:
- logging:
- driver: "none"
+version: 2
+services:
+ another:
+ logging:
+ driver: "none"
diff --git a/tests/fixtures/logging-composefile/docker-compose.yml b/tests/fixtures/logging-composefile/docker-compose.yml
index 877ee5e21..0a73030ad 100644
--- a/tests/fixtures/logging-composefile/docker-compose.yml
+++ b/tests/fixtures/logging-composefile/docker-compose.yml
@@ -1,12 +1,14 @@
-simple:
- image: busybox:latest
- command: top
- logging:
- driver: "none"
-another:
- image: busybox:latest
- command: top
- logging:
- driver: "json-file"
- options:
- max-size: "10m"
+version: 2
+services:
+ simple:
+ image: busybox:latest
+ command: top
+ logging:
+ driver: "none"
+ another:
+ image: busybox:latest
+ command: top
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "10m"