schema: Move schema.json -> config-schema.json and similar

To make it clear that these schemas are for validating config.json
(and not, for example, state JSON).  I've left the IDs alone for now,
because my PR adjusting those was rejected [1].

The rule for the -schema portion is "use it for entrypoint files" [2].

[1]: https://github.com/opencontainers/runtime-spec/pull/453
[2]: https://github.com/opencontainers/runtime-spec/pull/481#issuecomment-223641814

Signed-off-by: W. Trevor King <wking@tremily.us>
This commit is contained in:
W. Trevor King 2016-06-01 15:39:16 -07:00
parent 79b26a19e2
commit 59ede1a6ac
4 changed files with 10 additions and 10 deletions

View File

@ -2,13 +2,13 @@
## Overview
This directory contains the [JSON Schema](http://json-schema.org/) for
validating the `config.json` of this container runtime specification.
This directory contains the [JSON Schema](http://json-schema.org/) for validating JSON covered by this specification.
The layout of the files is as follows:
* [schema.json](schema.json) - the primary entrypoint for the whole schema document
* [schema-linux.json](schema-linux.json) - this schema is for the Linux-specific sub-structure
* [schema-solaris.json](schema-solaris.json) - this schema is for the Solaris-specific sub-structure
* [config-schema.json](config.json) - the primary entrypoint for the [configuration](../config.md) schema
* [config-linux.json](config-linux.json) - the [Linux-specific configuration sub-structure](../config-linux.md)
* [config-solaris.json](config-solaris.json) - the [Solaris-specific configuration sub-structure](../config-solaris.md)
* [defs.json](defs.json) - definitions for general types
* [defs-linux.json](defs-linux.json) - definitions for Linux-specific types
* [validate.go](validate.go) - validation utility source code
@ -16,8 +16,8 @@ The layout of the files is as follows:
## Utility
There is also included a simple utility for facilitating validation of a
`config.json`. To build it:
There is also included a simple utility for facilitating validation.
To build it:
```bash
export GOPATH=`mktemp -d`
@ -35,5 +35,5 @@ make validate
Then use it like:
```bash
./validate schema.json <yourpath>/config.json
./validate config-schema.json <yourpath>/config.json
```

View File

@ -166,10 +166,10 @@
}
},
"linux": {
"$ref": "schema-linux.json#/linux"
"$ref": "config-linux.json#/linux"
},
"solaris": {
"$ref": "schema-solaris.json#/solaris"
"$ref": "config-solaris.json#/solaris"
}
},
"required": [