Merge pull request opencontainers#684 from Mashimiao/schema-fix-inval…

…id-types schema: fix invalid types
wking · Feb 8, 2017 · 67c81aa · 67c81aa
2 parents 1f408dc + 4100020
commit 67c81aa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
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": [