Merge pull request #1024 from giuseppe/add-personality-schema

vbatts · web-flow · commit 020fda7ff619 · 2019-12-19T08:08:41.000-05:00
schema: add missing definition for personality
diff --git a/schema/config-linux.json b/schema/config-linux.json
@@ -249,6 +249,10 @@
                         "pattern": "^MB:[^\\n]*$"
                     }
                 }
+            },
+            "personality": {
+                "type": "object",
+                "$ref": "defs-linux.json#/definitions/Personality"
             }
         }
     }
diff --git a/schema/config-schema.json b/schema/config-schema.json
@@ -93,7 +93,6 @@
                             "$ref": "defs.json#/definitions/GID"
                         },
                         "umask": {
-                            "id": "https://opencontainers.org/schema/bundle/process/user/umask",
                             "$ref": "defs.json#/definitions/Umask"
                         },
                         "additionalGids": {
diff --git a/schema/defs-linux.json b/schema/defs-linux.json
@@ -1,5 +1,23 @@
 {
     "definitions": {
+        "PersonalityDomain": {
+            "type": "string",
+            "enum": [
+                "LINUX",
+                "LINUX32"
+            ]
+        },
+        "Personality": {
+            "type": "object",
+            "properties": {
+                "domain": {
+                    "$ref": "#/definitions/PersonalityDomain"
+                },
+                "flags": {
+                    "$ref": "defs.json#/definitions/ArrayOfStrings"
+                }
+            }
+        },
         "RootfsPropagation": {
             "type": "string",
             "enum": [
diff --git a/schema/defs.json b/schema/defs.json
@@ -60,9 +60,9 @@
         "GID": {
             "$ref": "#/definitions/uint32"
         },
-		"Umask": {
+        "Umask": {
             "$ref": "#/definitions/uint32"
-		},
+        },
         "ArrayOfGIDs": {
             "type": "array",
             "items": {

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,10 @@`
`249`	`249`	`"pattern": "^MB:[^\\n]*$"`
`250`	`250`	`}`
`251`	`251`	`}`
	`252`	`+ },`
	`253`	`+ "personality": {`
	`254`	`+ "type": "object",`
	`255`	`+ "$ref": "defs-linux.json#/definitions/Personality"`
`252`	`256`	`}`
`253`	`257`	`}`
`254`	`258`	`}`