From 79494b21756b330cff881c766818724f91c84944 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Thu, 27 Apr 2017 13:49:18 +0800 Subject: [PATCH 1/2] schema: Fix the error Signed-off-by: zhouhao --- schema/config-linux.json | 2 +- schema/defs-linux.json | 2 +- schema/defs-windows.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/schema/config-linux.json b/schema/config-linux.json index c0f649778..0a73d11fb 100644 --- a/schema/config-linux.json +++ b/schema/config-linux.json @@ -49,7 +49,7 @@ }, "oomScoreAdj": { "id": "https://opencontainers.org/schema/bundle/linux/resources/oomScoreAdj", - "type": "integer", + "type": "integer" }, "pids": { "id": "https://opencontainers.org/schema/bundle/linux/resources/pids", diff --git a/schema/defs-linux.json b/schema/defs-linux.json index 9e5466a0f..2ac6eeb2c 100644 --- a/schema/defs-linux.json +++ b/schema/defs-linux.json @@ -150,7 +150,7 @@ } }, "blkioWeight": { - "type": "integer", + "type": "integer" }, "blockIODevice": { "type": "object", diff --git a/schema/defs-windows.json b/schema/defs-windows.json index c9cfde0e5..319217a5c 100644 --- a/schema/defs-windows.json +++ b/schema/defs-windows.json @@ -2,7 +2,7 @@ "definitions": { "cpuShares": { "description": "Relative weight to other containers with CPU Shares defined", - "type": "integer", + "type": "integer" } } } From 11d1ae747c81cb915b47672347decbff6f273744 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Thu, 27 Apr 2017 13:57:49 +0800 Subject: [PATCH 2/2] schema: Format fix Signed-off-by: zhouhao --- schema/config-windows.json | 2 +- schema/defs-windows.json | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 schema/defs-windows.json diff --git a/schema/config-windows.json b/schema/config-windows.json index 38f7d6045..6017da5aa 100644 --- a/schema/config-windows.json +++ b/schema/config-windows.json @@ -32,7 +32,7 @@ }, "shares": { "id": "https://opencontainers.org/schema/bundle/windows/resources/cpu/shares", - "$ref": "defs-windows.json#/definitions/cpuShares" + "$ref": "defs.json#/definitions/uint16" }, "percent": { "id": "https://opencontainers.org/schema/bundle/windows/resources/cpu/percent", diff --git a/schema/defs-windows.json b/schema/defs-windows.json deleted file mode 100644 index 319217a5c..000000000 --- a/schema/defs-windows.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "definitions": { - "cpuShares": { - "description": "Relative weight to other containers with CPU Shares defined", - "type": "integer" - } - } -}