From 7a19b7548ff44955108a6a3bd4be9527babd1622 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 31 May 2018 14:12:10 +0200
Subject: [PATCH] Allow `x-*` extension on 3rd level objects

As for top-level key, any 3rd-level key which starts with `x-` will be
ignored by compose. This allows for users to:
* include additional metadata in their compose files
* create YAML anchor objects that can be re-used in other parts of the config

This matches a similar feature in the swagger spec definition:
https://swagger.io/specification/#specificationExtensions

This means a composefile like the following is valid

```
verison: "3.7"
services:
  foo:
    image: foo/bar
    x-foo: bar
network:
  bar:
    x-bar: baz
```

It concerns services, volumes, networks, configs and secrets.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 compose/config/config_schema_v2.4.json | 3 +++
 compose/config/config_schema_v3.7.json | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/compose/config/config_schema_v2.4.json b/compose/config/config_schema_v2.4.json
index 47e118755..4e6417887 100644
--- a/compose/config/config_schema_v2.4.json
+++ b/compose/config/config_schema_v2.4.json
@@ -346,6 +346,7 @@
       "dependencies": {
         "memswap_limit": ["mem_limit"]
       },
+      "patternProperties": {"^x-": {}},
       "additionalProperties": false
     },
 
@@ -409,6 +410,7 @@
         "labels": {"$ref": "#/definitions/labels"},
         "name": {"type": "string"}
       },
+      "patternProperties": {"^x-": {}},
       "additionalProperties": false
     },
 
@@ -451,6 +453,7 @@
         "labels": {"$ref": "#/definitions/labels"},
         "name": {"type": "string"}
       },
+      "patternProperties": {"^x-": {}},
       "additionalProperties": false
     },
 
diff --git a/compose/config/config_schema_v3.7.json b/compose/config/config_schema_v3.7.json
index 4c3d24dcd..05566cf81 100644
--- a/compose/config/config_schema_v3.7.json
+++ b/compose/config/config_schema_v3.7.json
@@ -319,6 +319,7 @@
         },
         "working_dir": {"type": "string"}
       },
+      "patternProperties": {"^x-": {}},
       "additionalProperties": false
     },
 
@@ -489,6 +490,7 @@
         "attachable": {"type": "boolean"},
         "labels": {"$ref": "#/definitions/list_or_dict"}
       },
+      "patternProperties": {"^x-": {}},
       "additionalProperties": false
     },
 
@@ -513,6 +515,7 @@
         },
         "labels": {"$ref": "#/definitions/list_or_dict"}
       },
+      "patternProperties": {"^x-": {}},
       "additionalProperties": false
     },
 
@@ -530,6 +533,7 @@
         },
         "labels": {"$ref": "#/definitions/list_or_dict"}
       },
+      "patternProperties": {"^x-": {}},
       "additionalProperties": false
     },
 
@@ -547,6 +551,7 @@
         },
         "labels": {"$ref": "#/definitions/list_or_dict"}
       },
+      "patternProperties": {"^x-": {}},
       "additionalProperties": false
     },