From 4100020dfcabf8484cd8d76fecf2825744ed8517 Mon Sep 17 00:00:00 2001 From: Ma Shimiao Date: Wed, 8 Feb 2017 16:32:34 +0800 Subject: [PATCH] schema: fix invalid types Signed-off-by: Ma Shimiao --- schema/config-linux.json | 6 +++--- schema/config-schema.json | 4 ++-- schema/defs-linux.json | 4 ++-- schema/defs.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/schema/config-linux.json b/schema/config-linux.json index 17cc72dc..f74f243e 100644 --- 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 index db2146cb..1566c4f0 100644 --- 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 index 1611a0c6..ca01a687 100644 --- 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 index 14e3e66c..5c3bb396 100644 --- a/schema/defs.json +++ b/schema/defs.json @@ -91,7 +91,7 @@ "$ref": "#/definitions/Env" }, "timeout": { - "$ref": "#/definitions/int" + "type": "integer" } }, "required": [