Merge pull request #452 from dnephin/compose-allow-x-fields

Allow extension fields in the v3.4 version of the compose format
docker · Aug 25, 2017 · d83752c · d83752c
2 parents cfb228b + 2a1857e
commit d83752c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go
diff --git a/cli/compose/schema/data/config_schema_v3.4.json b/cli/compose/schema/data/config_schema_v3.4.json
@@ -64,6 +64,7 @@
     }
   },
 
+  "patternProperties": {"^x-": {}},
   "additionalProperties": false,
 
   "definitions": {

diff --git a/cli/compose/schema/schema_test.go b/cli/compose/schema/schema_test.go
@@ -36,6 +36,16 @@ func TestValidateUndefinedTopLevelOption(t *testing.T) {
 	assert.Contains(t, err.Error(), "Additional property helicopters is not allowed")
 }
 
+func TestValidateAllowsXTopLevelFields(t *testing.T) {
+	config := dict{
+		"version":       "3.4",
+		"x-extra-stuff": dict{},
+	}
+
+	err := Validate(config, "3.4")
+	assert.NoError(t, err)
+}
+
 func TestValidateInvalidVersion(t *testing.T) {
 	config := dict{
 		"version": "2.1",