From 5076439d499ad68b53eacb613a4089697ed855d5 Mon Sep 17 00:00:00 2001
From: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Date: Thu, 12 Jan 2017 19:13:43 +0800
Subject: [PATCH] schema: fix items based on latest spec

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
---
 schema/config-linux.json |  4 ++++
 schema/defs-linux.json   | 24 ++++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/schema/config-linux.json b/schema/config-linux.json
index 0da996aab..cb6cbfba0 100644
--- a/schema/config-linux.json
+++ b/schema/config-linux.json
@@ -245,6 +245,10 @@
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/memory/kernel",
                                 "$ref": "defs.json#/definitions/int64Pointer"
                             },
+                            "kernelTCP": {
+                                "id": "https://opencontainers.org/schema/bundle/linux/resources/memory/kernelTCP",
+                                "$ref": "defs.json#/definitions/int64Pointer"
+                            },
                             "limit": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/memory/limit",
                                 "$ref": "defs.json#/definitions/int64Pointer"
diff --git a/schema/defs-linux.json b/schema/defs-linux.json
index 0cecb14a0..b4783f2c5 100644
--- a/schema/defs-linux.json
+++ b/schema/defs-linux.json
@@ -96,9 +96,6 @@
             "minimum": 0,
             "maximum": 512
         },
-        "FilePermissions": {
-            "type": "string"
-        },
         "FileType": {
             "description": "Type of a block or special character device",
             "type": "string",
@@ -116,9 +113,6 @@
                 "type": {
                     "$ref": "#/definitions/FileType"
                 },
-                "permissions": {
-                    "$ref": "#/definitions/FilePermissions"
-                },
                 "path": {
                     "$ref": "defs.json#/definitions/FilePath"
                 },
@@ -132,10 +126,24 @@
                     "$ref": "#/definitions/Minor"
                 },
                 "uid": {
-                    "$ref": "defs.json#/definitions/UID"
+                    "oneOf": [
+                        {
+                            "$ref": "defs.json#/definitions/UID"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ]
                 },
                 "gid": {
-                    "$ref": "defs.json#/definitions/GID"
+                    "oneOf": [
+                        {
+                            "$ref": "defs.json#/definitions/GID"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ]
                 }
             }
         },