a3dd52f583
Merge pull request #646 from q384566678/json-test
...
Perfect json content
2017-01-11 14:24:24 -08:00
2d5e0df2f0
Perfect json content
...
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
2017-01-06 10:34:38 +08:00
a78f255982
config: Explicitly list 'hooks' as optional
...
And make it omitempty, otherwise:
$ ocitools generate --template <(echo '{}')
$ cat config.json | jq -S .
{
"hooks": {},
...
}
To provide space for the type information and 'optional', I've
shuffled the hook docs to follow our usual:
* **`{property}`** ({type}, {when-needed}) {notes}
format. I've kept the separate event-trigger sections (e.g. "###
Prestart") since they go into more detail on the timing, purpose, and
exit handling for the different events (and that seemed like too much
information to put into the nested lists).
I've replaced the Go reference from 48049d2#255 ) with POSIX references (following the
new process docs) to address pushback against referencing Go [1,2] in
favor of POSIX links [3]. Rob Dolin had suggested
"platform-appropriate" wording [4], but it seems like Visual Studio
2015 supports execv [5], and providing an explicit
"platform-appropriate" wiggle seems like it's adding useless
complication.
[1]: https://github.com/opencontainers/runtime-spec/pull/427#discussion_r62362761
[2]: http://ircbot.wl.linuxfoundation.org/meetings/opencontainers/2016/opencontainers.2016-05-18-17.01.log.html#l-46
[3]: http://ircbot.wl.linuxfoundation.org/meetings/opencontainers/2016/opencontainers.2016-05-18-17.01.log.html#l-52
[4]: http://ircbot.wl.linuxfoundation.org/meetings/opencontainers/2016/opencontainers.2016-05-18-17.01.log.html#l-54
[5]: https://msdn.microsoft.com/en-us/library/886kc0as.aspx
Signed-off-by: W. Trevor King <wking@tremily.us>
2017-01-04 14:12:16 -08:00
dc8f2c2e6e
Add support for Windows-based containers
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-22 12:13:04 -07:00
d7b8877547
config: Consistent Markdown/Go/JSON-Schema wording for 'root'
...
I've also added our usual:
(<type>, <required|optional>)
to the Markdown so folks can see that this is a required object.
Signed-off-by: W. Trevor King <wking@tremily.us>
2016-08-03 00:16:24 -07:00
a3126aa342
schema/defs.json: Pull annotations over from config-schema.json
...
So we can use it in the coming state-schema.json without duplication.
I dropped the "id" because none of the other defs.json entries had an
ID.
Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-08 20:43:06 -07:00
28cbd4dd8e
schema/defs.json: Pull ociVersion over from config-schema.json
...
So we can use it in the coming state-schema.json without duplication.
While I'm touching it, I updated the spec title to match the project
README's header. I also dropped the "id" because none of the other
defs.json entries had an ID.
Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-08 20:43:06 -07:00
59ede1a6ac
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>
2016-06-08 20:43:06 -07:00
Mrunal Patel
zhouhao
W. Trevor King
John Howard