Merge pull request #655 from Mashimiao/schema-fix-with-latest-spec

schema: fix items based on latest spec
opencontainers · Jan 18, 2017 · dc0fa75 · dc0fa75
2 parents 937ea7b + 5076439
commit dc0fa75
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git 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
@@ -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"
+                        }
+                    ]
                 }
             }
         },