Skip to content

Commit

Permalink
attributes also can be declared as string (using variables)
Browse files Browse the repository at this point in the history 
Signed-off-by: Nicolas De Loof <[email protected]>
  • Loading branch information
@ndeloof
ndeloof committed Jul 3, 2024
1 parent a2bc3b4 commit 8360e86
Show file tree
Hide file tree
Showing 3 changed files with 203 additions and 61 deletions.
130 changes: 69 additions & 61 deletions schema/compose-spec.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

"name": {
"type": "string",
"pattern": "^[a-z0-9][a-z0-9_-]*$",
"description": "define the Compose project name, until user defines one explicitly."
},

Expand Down Expand Up @@ -94,7 +93,7 @@
"develop": {"$ref": "#/definitions/development"},
"deploy": {"$ref": "#/definitions/deployment"},
"annotations": {"$ref": "#/definitions/list_or_dict"},
"attach": {"type": "boolean"},
"attach": {"type": ["boolean", "string"]},
"build": {
"oneOf": [
{"type": "string"},
Expand All @@ -110,15 +109,15 @@
"labels": {"$ref": "#/definitions/list_or_dict"},
"cache_from": {"type": "array", "items": {"type": "string"}},
"cache_to": {"type": "array", "items": {"type": "string"}},
"no_cache": {"type": "boolean"},
"no_cache": {"type": ["boolean", "string"]},
"additional_contexts": {"$ref": "#/definitions/list_or_dict"},
"network": {"type": "string"},
"pull": {"type": "boolean"},
"pull": {"type": ["boolean", "string"]},
"target": {"type": "string"},
"shm_size": {"type": ["integer", "string"]},
"extra_hosts": {"$ref": "#/definitions/list_or_dict"},
"isolation": {"type": "string"},
"privileged": {"type": "boolean"},
"privileged": {"type": ["boolean", "string"]},
"secrets": {"$ref": "#/definitions/service_config_or_secret"},
"tags": {"type": "array", "items": {"type": "string"}},
"ulimits": {"$ref": "#/definitions/ulimits"},
Expand Down Expand Up @@ -148,7 +147,7 @@
"type": "array",
"items": {"$ref": "#/definitions/blkio_limit"}
},
"weight": {"type": "integer"},
"weight": {"type": ["integer", "string"]},
"weight_device": {
"type": "array",
"items": {"$ref": "#/definitions/blkio_weight"}
Expand All @@ -163,8 +162,14 @@
"command": {"$ref": "#/definitions/command"},
"configs": {"$ref": "#/definitions/service_config_or_secret"},
"container_name": {"type": "string"},
"cpu_count": {"type": "integer", "minimum": 0},
"cpu_percent": {"type": "integer", "minimum": 0, "maximum": 100},
"cpu_count": {"oneOf": [
{"type": "string"},
{"type": "integer", "minimum": 0}
]},
"cpu_percent": {"oneOf": [
{"type": "string"},
{"type": "integer", "minimum": 0, "maximum": 100}
]},
"cpu_shares": {"type": ["number", "string"]},
"cpu_quota": {"type": ["number", "string"]},
"cpu_period": {"type": ["number", "string"]},
Expand Down Expand Up @@ -193,7 +198,7 @@
"type": "object",
"additionalProperties": false,
"properties": {
"restart": {"type": "boolean"},
"restart": {"type": ["boolean", "string"]},
"required": {
"type": "boolean",
"default": true
Expand Down Expand Up @@ -254,7 +259,7 @@
"healthcheck": {"$ref": "#/definitions/healthcheck"},
"hostname": {"type": "string"},
"image": {"type": "string"},
"init": {"type": "boolean"},
"init": {"type": ["boolean", "string"]},
"ipc": {"type": "string"},
"isolation": {"type": "string"},
"labels": {"$ref": "#/definitions/list_or_dict"},
Expand All @@ -277,7 +282,7 @@
"mac_address": {"type": "string"},
"mem_limit": {"type": ["number", "string"]},
"mem_reservation": {"type": ["string", "integer"]},
"mem_swappiness": {"type": "integer"},
"mem_swappiness": {"type": ["integer", "string"]},
"memswap_limit": {"type": ["number", "string"]},
"network_mode": {"type": "string"},
"networks": {
Expand Down Expand Up @@ -315,24 +320,27 @@
}
]
},
"oom_kill_disable": {"type": "boolean"},
"oom_score_adj": {"type": "integer", "minimum": -1000, "maximum": 1000},
"oom_kill_disable": {"type": ["boolean", "string"]},
"oom_score_adj": {"oneOf": [
{"type": "string"},
{"type": "integer", "minimum": -1000, "maximum": 1000}
]},
"pid": {"type": ["string", "null"]},
"pids_limit": {"type": ["number", "string"]},
"platform": {"type": "string"},
"ports": {
"type": "array",
"items": {
"oneOf": [
{"type": "number", "format": "ports"},
{"type": "string", "format": "ports"},
{"type": "number"},
{"type": "string"},
{
"type": "object",
"properties": {
"name": {"type": "string"},
"mode": {"type": "string"},
"host_ip": {"type": "string"},
"target": {"type": "integer"},
"target": {"type": ["integer", "string"]},
"published": {"type": ["string", "integer"]},
"protocol": {"type": "string"},
"app_protocol": {"type": "string"}
Expand All @@ -344,29 +352,29 @@
},
"uniqueItems": true
},
"privileged": {"type": "boolean"},
"privileged": {"type": ["boolean", "string"]},
"profiles": {"$ref": "#/definitions/list_of_strings"},
"pull_policy": {"type": "string", "enum": [
"always", "never", "if_not_present", "build", "missing"
]},
"read_only": {"type": "boolean"},
"read_only": {"type": ["boolean", "string"]},
"restart": {"type": "string"},
"runtime": {
"type": "string"
},
"scale": {
"type": "integer"
"type": ["integer", "string"]
},
"security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
"shm_size": {"type": ["number", "string"]},
"secrets": {"$ref": "#/definitions/service_config_or_secret"},
"sysctls": {"$ref": "#/definitions/list_or_dict"},
"stdin_open": {"type": "boolean"},
"stop_grace_period": {"type": "string", "format": "duration"},
"stdin_open": {"type": ["boolean", "string"]},
"stop_grace_period": {"type": "string"},
"stop_signal": {"type": "string"},
"storage_opt": {"type": "object"},
"tmpfs": {"$ref": "#/definitions/string_or_list"},
"tty": {"type": "boolean"},
"tty": {"type": ["boolean", "string"]},
"ulimits": {"$ref": "#/definitions/ulimits"},
"user": {"type": "string"},
"uts": {"type": "string"},
Expand All @@ -383,13 +391,13 @@
"type": {"type": "string"},
"source": {"type": "string"},
"target": {"type": "string"},
"read_only": {"type": "boolean"},
"read_only": {"type": ["boolean", "string"]},
"consistency": {"type": "string"},
"bind": {
"type": "object",
"properties": {
"propagation": {"type": "string"},
"create_host_path": {"type": "boolean"},
"create_host_path": {"type": ["boolean", "string"]},
"selinux": {"type": "string", "enum": ["z", "Z"]}
},
"additionalProperties": false,
Expand All @@ -398,7 +406,7 @@
"volume": {
"type": "object",
"properties": {
"nocopy": {"type": "boolean"},
"nocopy": {"type": ["boolean", "string"]},
"subpath": {"type": "string"}
},
"additionalProperties": false,
Expand All @@ -413,7 +421,7 @@
{"type": "string"}
]
},
"mode": {"type": "number"}
"mode": {"type": ["number", "string"]}
},
"additionalProperties": false,
"patternProperties": {"^x-": {}}
Expand Down Expand Up @@ -441,18 +449,18 @@
"id": "#/definitions/healthcheck",
"type": "object",
"properties": {
"disable": {"type": "boolean"},
"interval": {"type": "string", "format": "duration"},
"retries": {"type": "number"},
"disable": {"type": ["boolean", "string"]},
"interval": {"type": "string"},
"retries": {"type": ["number", "string"]},
"test": {
"oneOf": [
{"type": "string"},
{"type": "array", "items": {"type": "string"}}
]
},
"timeout": {"type": "string", "format": "duration"},
"start_period": {"type": "string", "format": "duration"},
"start_interval": {"type": "string", "format": "duration"}
"timeout": {"type": "string"},
"start_period": {"type": "string"},
"start_interval": {"type": "string"}
},
"additionalProperties": false,
"patternProperties": {"^x-": {}}
Expand Down Expand Up @@ -484,16 +492,16 @@
"properties": {
"mode": {"type": "string"},
"endpoint_mode": {"type": "string"},
"replicas": {"type": "integer"},
"replicas": {"type": ["integer", "string"]},
"labels": {"$ref": "#/definitions/list_or_dict"},
"rollback_config": {
"type": "object",
"properties": {
"parallelism": {"type": "integer"},
"delay": {"type": "string", "format": "duration"},
"parallelism": {"type": ["integer", "string"]},
"delay": {"type": "string"},
"failure_action": {"type": "string"},
"monitor": {"type": "string", "format": "duration"},
"max_failure_ratio": {"type": "number"},
"monitor": {"type": "string"},
"max_failure_ratio": {"type": ["number", "string"]},
"order": {"type": "string", "enum": [
"start-first", "stop-first"
]}
Expand All @@ -504,11 +512,11 @@
"update_config": {
"type": "object",
"properties": {
"parallelism": {"type": "integer"},
"delay": {"type": "string", "format": "duration"},
"parallelism": {"type": ["integer", "string"]},
"delay": {"type": "string"},
"failure_action": {"type": "string"},
"monitor": {"type": "string", "format": "duration"},
"max_failure_ratio": {"type": "number"},
"monitor": {"type": "string"},
"max_failure_ratio": {"type": ["number", "string"]},
"order": {"type": "string", "enum": [
"start-first", "stop-first"
]}
Expand All @@ -524,7 +532,7 @@
"properties": {
"cpus": {"type": ["number", "string"]},
"memory": {"type": "string"},
"pids": {"type": "integer"}
"pids": {"type": ["integer", "string"]}
},
"additionalProperties": false,
"patternProperties": {"^x-": {}}
Expand All @@ -548,9 +556,9 @@
"type": "object",
"properties": {
"condition": {"type": "string"},
"delay": {"type": "string", "format": "duration"},
"max_attempts": {"type": "integer"},
"window": {"type": "string", "format": "duration"}
"delay": {"type": "string"},
"max_attempts": {"type": ["integer", "string"]},
"window": {"type": "string"}
},
"additionalProperties": false,
"patternProperties": {"^x-": {}}
Expand All @@ -570,7 +578,7 @@
"patternProperties": {"^x-": {}}
}
},
"max_replicas_per_node": {"type": "integer"}
"max_replicas_per_node": {"type": ["integer", "string"]}
},
"additionalProperties": false,
"patternProperties": {"^x-": {}}
Expand All @@ -590,7 +598,7 @@
"type": "object",
"properties": {
"kind": {"type": "string"},
"value": {"type": "number"}
"value": {"type": ["number", "string"]}
},
"additionalProperties": false,
"patternProperties": {"^x-": {}}
Expand Down Expand Up @@ -655,7 +663,7 @@
"items": {
"type": "object",
"properties": {
"subnet": {"type": "string", "format": "subnet_ip_address"},
"subnet": {"type": "string"},
"ip_range": {"type": "string"},
"gateway": {"type": "string"},
"aux_addresses": {
Expand All @@ -678,7 +686,7 @@
"patternProperties": {"^x-": {}}
},
"external": {
"type": ["boolean", "object"],
"type": ["boolean", "string", "object"],
"properties": {
"name": {
"deprecated": true,
Expand All @@ -688,9 +696,9 @@
"additionalProperties": false,
"patternProperties": {"^x-": {}}
},
"internal": {"type": "boolean"},
"enable_ipv6": {"type": "boolean"},
"attachable": {"type": "boolean"},
"internal": {"type": ["boolean", "string"]},
"enable_ipv6": {"type": ["boolean", "string"]},
"attachable": {"type": ["boolean", "string"]},
"labels": {"$ref": "#/definitions/list_or_dict"}
},
"additionalProperties": false,
Expand All @@ -710,7 +718,7 @@
}
},
"external": {
"type": ["boolean", "object"],
"type": ["boolean", "string", "object"],
"properties": {
"name": {
"deprecated": true,
Expand All @@ -734,7 +742,7 @@
"environment": {"type": "string"},
"file": {"type": "string"},
"external": {
"type": ["boolean", "object"],
"type": ["boolean", "string", "object"],
"properties": {
"name": {"type": "string"}
}
Expand Down Expand Up @@ -762,7 +770,7 @@
"environment": {"type": "string"},
"file": {"type": "string"},
"external": {
"type": ["boolean", "object"],
"type": ["boolean", "string", "object"],
"properties": {
"name": {
"deprecated": true,
Expand Down Expand Up @@ -801,7 +809,7 @@
"type": "string"
},
"required": {
"type": "boolean",
"type": ["boolean", "string"],
"default": true
}
},
Expand Down Expand Up @@ -855,7 +863,7 @@
"type": "object",
"properties": {
"path": {"type": "string"},
"weight": {"type": "integer"}
"weight": {"type": ["integer", "string"]}
},
"additionalProperties": false
},
Expand All @@ -871,7 +879,7 @@
"target": {"type": "string"},
"uid": {"type": "string"},
"gid": {"type": "string"},
"mode": {"type": "number"}
"mode": {"type": ["number", "string"]}
},
"additionalProperties": false,
"patternProperties": {"^x-": {}}
Expand All @@ -884,12 +892,12 @@
"patternProperties": {
"^[a-z]+$": {
"oneOf": [
{"type": "integer"},
{"type": ["integer", "string"]},
{
"type": "object",
"properties": {
"hard": {"type": "integer"},
"soft": {"type": "integer"}
"hard": {"type": ["integer", "string"]},
"soft": {"type": ["integer", "string"]}
},
"required": ["soft", "hard"],
"additionalProperties": false,
Expand Down
Loading

0 comments on commit 8360e86

Please sign in to comment.