Merge pull request moby#29883 from dnephin/update-to-latest-schema

Update compose schema v3
Enselic · Jan 23, 2017 · eac3e4b · eac3e4b
2 parents b157b3c + de1ffeb
commit eac3e4b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go
diff --git a/cli/compose/schema/data/config_schema_v3.0.json b/cli/compose/schema/data/config_schema_v3.0.json
@@ -167,9 +167,10 @@
         "restart": {"type": "string"},
         "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "shm_size": {"type": ["number", "string"]},
+        "sysctls": {"$ref": "#/definitions/list_or_dict"},
         "stdin_open": {"type": "boolean"},
-        "stop_signal": {"type": "string"},
         "stop_grace_period": {"type": "string", "format": "duration"},
+        "stop_signal": {"type": "string"},
         "tmpfs": {"$ref": "#/definitions/string_or_list"},
         "tty": {"type": "boolean"},
         "ulimits": {
@@ -192,6 +193,7 @@
           }
         },
         "user": {"type": "string"},
+        "userns_mode": {"type": "string"},
         "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "working_dir": {"type": "string"}
       },
@@ -200,20 +202,20 @@
 
     "healthcheck": {
       "id": "#/definitions/healthcheck",
-      "type": ["object", "null"],
+      "type": "object",
+      "additionalProperties": false,
       "properties": {
-        "interval": {"type":"string"},
-        "timeout": {"type":"string"},
+        "disable": {"type": "boolean"},
+        "interval": {"type": "string"},
         "retries": {"type": "number"},
         "test": {
           "oneOf": [
             {"type": "string"},
             {"type": "array", "items": {"type": "string"}}
           ]
         },
-        "disable": {"type": "boolean"}
-      },
-      "additionalProperties": false
+        "timeout": {"type": "string"}
+      }
     },
     "deployment": {
       "id": "#/definitions/deployment",
@@ -326,10 +328,11 @@
           "type": ["boolean", "object"],
           "properties": {
             "name": {"type": "string"}
-          }
-        }
+          },
+          "additionalProperties": false
+        },
+        "labels": {"$ref": "#/definitions/list_or_dict"}
       },
-      "labels": {"$ref": "#/definitions/list_or_dict"},
       "additionalProperties": false
     },
 

diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go
@@ -25,7 +25,9 @@ var UnsupportedProperties = []string{
 	"security_opt",
 	"shm_size",
 	"stop_signal",
+	"sysctls",
 	"tmpfs",
+	"userns_mode",
 }
 
 // DeprecatedProperties that were removed from the v3 format, but their

diff --git a/hack/validate/compose-bindata b/hack/validate/compose-bindata
@@ -10,7 +10,7 @@ unset IFS
 if [ ${#files[@]} -gt 0 ]; then
 	go generate github.com/docker/docker/cli/compose/schema 2> /dev/null
 	# Let see if the working directory is clean
-	diffs="$(git status --porcelain -- api/types/ 2>/dev/null)"
+	diffs="$(git status --porcelain -- cli/compose/schema 2>/dev/null)"
 	if [ "$diffs" ]; then
 		{
 			echo 'The result of `go generate github.com/docker/docker/cli/compose/schema` differs'