schema: rebase for opencontainers#329

Signed-off-by: Vincent Batts <[email protected]>
vbatts · Mar 9, 2016 · a1a95ce · a1a95ce
1 parent 5881cc1
commit a1a95ce
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/schema/schema-linux.json b/schema/schema-linux.json
@@ -4,14 +4,6 @@
      "id": "https://opencontainers.org/schema/bundle/linux",
      "type": "object",
      "properties": {
-         "apparmorProfile": {
-             "id": "https://opencontainers.org/schema/bundle/linux/apparmorProfile",
-             "type": "string"
-         },
-         "capabilities": {
-             "id": "https://opencontainers.org/schema/bundle/linux/capabilities",
-             "$ref": "defs.json#/definitions/ArrayOfStrings"
-         },
          "devices": {
              "id": "https://opencontainers.org/schema/bundle/linux/devices",
              "oneOf": [
@@ -285,10 +277,6 @@
              },
              "type": "object"
          },
-         "selinuxProcessLabel": {
-             "id": "https://opencontainers.org/schema/bundle/linux/selinuxProcessLabel",
-             "type": "string"
-         },
          "sysctl": {
              "id": "https://opencontainers.org/schema/bundle/linux/sysctl",
              "oneOf" : [

diff --git a/schema/schema.json b/schema/schema.json
@@ -67,7 +67,7 @@
             "type": "object",
             "required": [
               "cwd",
-              "user"
+              "args"
             ],
             "properties": {
                 "args": {
@@ -103,6 +103,22 @@
                             "$ref": "defs.json#/definitions/ArrayOfGIDs"
                         }
                     }
+                },
+                "capabilities": {
+                    "id": "https://opencontainers.org/schema/bundle/process/linux/capabilities",
+                    "$ref": "defs.json#/definitions/ArrayOfStrings"
+                },
+                "apparmorProfile": {
+                    "id": "https://opencontainers.org/schema/bundle/process/linux/apparmorProfile",
+                    "type": "string"
+                },
+                "selinuxProcessLabel": {
+                    "id": "https://opencontainers.org/schema/bundle/process/linux/selinuxProcessLabel",
+                    "type": "string"
+                },
+                "noNewPrivileges": {
+                    "id": "https://opencontainers.org/schema/bundle/process/linux/noNewPrivileges",
+                    "type": "boolean"
                 }
             }
         },