Skip to content

Commit cb8e8cb

Browse files
committed
schema: Move schema.json -> config.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]. [1]: opencontainers#453 Signed-off-by: W. Trevor King <[email protected]>
1 parent f0e14cd commit cb8e8cb

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

schema/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ This directory contains the [JSON Schema](http://json-schema.org/) for
66
validating the `config.json` of this container runtime specification.
77

88
The layout of the files is as follows:
9-
* [schema.json](schema.json) - the primary entrypoint for the whole schema document
10-
* [schema-linux.json](schema-linux.json) - this schema is for the Linux-specific sub-structure
11-
* [schema-solaris.json](schema-solaris.json) - this schema is for the Solaris-specific sub-structure
9+
* [config.json](config.json) - the primary entrypoint for the [`config.json`](../config.md) schema
10+
* [config-linux.json](config-linux.json) - the [Linux-specific sub-structure](../config-linux.md)
11+
* [config-solaris.json](config-solaris.json) - the [Solaris-specific sub-structure](../config-solaris.md)
1212
* [defs.json](defs.json) - definitions for general types
1313
* [defs-linux.json](defs-linux.json) - definitions for Linux-specific types
1414
* [validate.go](validate.go) - validation utility source code
@@ -35,5 +35,5 @@ make validate
3535
Then use it like:
3636

3737
```bash
38-
./validate schema.json <yourpath>/config.json
38+
./validate config.json <yourpath>/config.json
3939
```
File renamed without changes.
File renamed without changes.

schema/schema.json renamed to schema/config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@
166166
}
167167
},
168168
"linux": {
169-
"$ref": "schema-linux.json#/linux"
169+
"$ref": "config-linux.json#/linux"
170170
},
171171
"solaris": {
172-
"$ref": "schema-solaris.json#/solaris"
172+
"$ref": "config-solaris.json#/solaris"
173173
}
174174
},
175175
"required": [

schema/validate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
func main() {
1212
if len(os.Args[1:]) != 2 {
13-
fmt.Printf("ERROR: usage is: %s <schema.json> <config.json>\n", os.Args[0])
13+
fmt.Printf("ERROR: usage is: %s <schema.json> <document.json>\n", os.Args[0])
1414
os.Exit(1)
1515
}
1616

0 commit comments

Comments
 (0)