Merge pull request #564 from xiekeyang/config-schema

move defs-config.json to config-schema.json
opencontainers · Feb 14, 2017 · c91797c · c91797c
2 parents c16fa01 + 5bf90dd
commit c91797c
Show file tree

Hide file tree

Showing 3 changed files with 946 additions and 760 deletions.
diff --git a/schema/config-schema.json b/schema/config-schema.json
@@ -18,15 +18,114 @@
       "type": "string"
     },
     "config": {
-      "$ref": "defs-config.json#/definitions/config"
+      "type": "object",
+      "properties": {
+        "User": {
+          "type": "string"
+        },
+        "ExposedPorts": {
+          "$ref": "defs.json#/definitions/mapStringObject"
+        },
+        "Env": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "Entrypoint": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "Cmd": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "Volumes": {
+          "oneOf": [
+            {
+              "$ref": "defs.json#/definitions/mapStringObject"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "WorkingDir": {
+          "type": "string"
+        },
+        "Labels": {
+          "oneOf": [
+            {
+              "$ref": "defs.json#/definitions/mapStringString"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      }
     },
     "rootfs": {
-      "$ref": "defs-config.json#/definitions/rootfs"
+      "type": "object",
+      "properties": {
+        "diff_ids": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "layers"
+          ]
+        }
+      },
+      "required": [
+        "diff_ids",
+        "type"
+      ]
     },
     "history": {
       "type": "array",
       "items": {
-        "$ref": "defs-config.json#/definitions/history"
+        "type": "object",
+        "properties": {
+          "created": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "author": {
+            "type": "string"
+          },
+          "created_by": {
+            "type": "string"
+          },
+          "comment": {
+            "type": "string"
+          },
+          "empty_layer": {
+            "type": "boolean"
+          }
+        }
       }
     }
   },

diff --git a/schema/defs-config.json b/schema/defs-config.json