schema: fix invalid types

Ma Shimiao · Ma Shimiao · commit 4100020dfcab · 2017-02-08T16:35:45.000+08:00
Signed-off-by: Ma Shimiao &lt;mashimiao.fnst@cn.fujitsu.com&gt;
diff --git a/schema/config-linux.json b/schema/config-linux.json
@@ -121,11 +121,11 @@
                         "properties": {
                             "cpus": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/cpus",
-                                "$ref": "string"
+                                "type": "string"
                             },
                             "mems": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/mems",
-                                "$ref": "string"
+                                "type": "string"
                             },
                             "period": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/period",
@@ -223,7 +223,7 @@
             },
             "cgroupsPath": {
                 "id": "https://opencontainers.org/schema/bundle/linux/cgroupsPath",
-                "$ref": "string"
+                "type": "string"
             },
             "rootfsPropagation": {
                 "id": "https://opencontainers.org/schema/bundle/linux/rootfsPropagation",
diff --git a/schema/config-schema.json b/schema/config-schema.json
@@ -95,11 +95,11 @@
                     "properties": {
                         "height": {
                             "id": "https://opencontainers.org/schema/bundle/process/consoleSize/height",
-                            "$ref": "defs.json#/definitions/unit64"
+                            "$ref": "defs.json#/definitions/uint64"
                         },
                         "width": {
                             "id": "https://opencontainers.org/schema/bundle/process/consoleSize/width",
-                            "$ref": "defs.json#/definitions/unit64"
+                            "$ref": "defs.json#/definitions/uint64"
                         }
                     }
                 },
diff --git a/schema/defs-linux.json b/schema/defs-linux.json
@@ -194,7 +194,7 @@
                     "type": "boolean"
                 },
                 "type": {
-                    "$ref": "string"
+                    "type": "string"
                 },
                 "major": {
                     "$ref": "#/definitions/Major"
@@ -203,7 +203,7 @@
                     "$ref": "#/definitions/Minor"
                 },
                 "access": {
-                    "$ref": "string"
+                    "type": "string"
                 }
             },
             "required": [
diff --git a/schema/defs.json b/schema/defs.json
@@ -91,7 +91,7 @@
                     "$ref": "#/definitions/Env"
                 },
                 "timeout": {
-                    "$ref": "#/definitions/int"
+                    "type": "integer"
                 }
             },
             "required": [

Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,11 @@`
`95`	`95`	`"properties": {`
`96`	`96`	`"height": {`
`97`	`97`	`"id": "https://opencontainers.org/schema/bundle/process/consoleSize/height",`
`98`		`- "$ref": "defs.json#/definitions/unit64"`
	`98`	`+ "$ref": "defs.json#/definitions/uint64"`
`99`	`99`	`},`
`100`	`100`	`"width": {`
`101`	`101`	`"id": "https://opencontainers.org/schema/bundle/process/consoleSize/width",`
`102`		`- "$ref": "defs.json#/definitions/unit64"`
	`102`	`+ "$ref": "defs.json#/definitions/uint64"`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`},`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@`
`91`	`91`	`"$ref": "#/definitions/Env"`
`92`	`92`	`},`
`93`	`93`	`"timeout": {`
`94`		`- "$ref": "#/definitions/int"`
	`94`	`+ "type": "integer"`
`95`	`95`	`}`
`96`	`96`	`},`
`97`	`97`	`"required": [`