Commit Graph

544 Commits

Author SHA1 Message Date
W. Trevor King 5c2193f357 specs-go/config: Make Linux and Solaris omitempty
Both fields are optional, so you could conceivably have neither.
However, in most cases folks will populate the one corresponding to
their platform.  The one that *doesn't* match their platform must not
show up, in order to avoid violating the:

  This should only be set if **`platform.os`** is ...

phrasing.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-06 23:58:09 -07:00
W. Trevor King 759ee79c85 config: Add platform-specific entry for 'solaris'
Fixup for 7c9daeb (Introducing Solaris in OCI, 2016-04-25, #411) along
the lines of b373a15 (config: Split platform-specific configuration
into its own section, 2016-05-02, #414).

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-06 23:57:14 -07:00
Michael Crosby dbce512cec Merge pull request #425 from amitsaha/uid_gid_fix
UID and GID for the main process are not optional
2016-05-06 10:39:54 -07:00
Michael Crosby 9066491ef8 Merge pull request #426 from wking/no-tab-indents
config: Use spaces (not tabs) to indent JSON
2016-05-06 10:39:01 -07:00
W. Trevor King 41cddd7b8a config: Use spaces (not tabs) to indent JSON
Change made with:

  $ sed -i 's/\t/    /g' config.md

fixing tabs that were added with 1c49f4d2 (Add annotations and labels
to the Spec, 2016-03-04, #331).

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-05 19:23:32 -07:00
Amit Saha 815ce4e2eb UID and GID for the main process are not optional
The spec requires UID and GID to be specified, so we shouldn't
ignore if they are not specified.

Signed-off-by: Amit Saha <amitsaha.in@gmail.com>
2016-05-06 10:41:51 +10:00
Vincent Batts 38dd2fdc30 Merge pull request #424 from anuthan/configlink
Adding link in README.md to Solaris configuration.
2016-05-05 12:47:16 -04:00
Abhijeeth Nuthan ebcf9cb653 Adding link in README.md to Solaris configuration.
Signed-off-by: Abhijeeth Nuthan <abhijeeth.nuthan@oracle.com>
2016-05-05 09:17:38 -07:00
Vincent Batts bf58a8f544 Merge pull request #411 from anuthan/solarisSpec
Introducing Solaris in OCI
2016-05-04 16:17:37 -04:00
Abhijeeth Nuthan 7c9daebaa7 Introducing Solaris in OCI
Signed-off-by: Abhijeeth Nuthan <abhijeeth.nuthan@oracle.com>
2016-05-04 12:19:27 -07:00
Michael Crosby 07126441b3 Merge pull request #415 from wking/explicit-hook-namespace
config: Explicitly put hooks in the runtime namespace
2016-05-04 10:18:56 -07:00
Vincent Batts cbea66a275 Merge pull request #422 from vbatts/travis_make_target
travis: have make target be travis sensitive
2016-05-03 16:35:52 -04:00
Vincent Batts e65fe55686 travis: have make target be travis sensitive
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2016-05-03 15:25:31 -04:00
Mrunal Patel 3b78e51738 Merge pull request #419 from wking/lifecycle-cleanup-step-7
runtime: Fix 'step 8' -> 'step 7' references
2016-05-02 12:41:17 -07:00
W. Trevor King 0382257baf runtime: Fix 'step 8' -> 'step 7' references
This slipped through the renumbering in 7117ede7 (Expand on the
definition of our ops, 2015-10-13, #225).

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-02 11:40:48 -07:00
Vincent Batts 4941dba4a8 version: include version in produced docs (#406)
Fixes #398

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2016-05-02 14:10:02 -04:00
Rob Dolin (MSFT) 9630bf7acb [ Lifecycle ] Increase importance of logging errors (#410)
"errors, if any, MAY be logged" --> "errors, if any, SHOULD be logged"

Signed-off-by: Rob Dolin <RobDolin@microsoft.com>
2016-05-02 14:09:25 -04:00
Vincent Batts 3db55ea3ba *: fetch code-of-conduct.md from tob (#413)
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2016-05-02 14:04:54 -04:00
W. Trevor King b373a155de config: Split platform-specific configuration into its own section (#414)
To make it clear that the whole 'linux' section is optional.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-02 14:04:39 -04:00
Amit Saha 45f7ada1bb config.md: args is an array of strings (#416)
Signed-off-by: Amit Saha <amitsaha.in@gmail.com>
2016-05-01 10:10:56 -04:00
W. Trevor King a5af569061 config: Explicitly put hooks in the runtime namespace
The language from 15dee2e0 (runtime: Add prestart/poststop hooks,
2015-08-03, #34) landed well before we had glossary entries for the
runtime and container namespaces (from 5dad1255, config-linux: Specify
host mount namespace for namespace paths, 2015-12-18, #275).  Now that
we do have language to cover that concept, it's better to explicitly
say that hooks run in the runtime namespace instead of leaving it to
the reader to extrapolate from the filesystem requirement.

With the new namespace wording, the "host's filesystem" wording is
somewhat redundant.  I've left it in though, because I think it helps
to have a more gradual transition from hook paths to namespaces.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-04-29 21:07:00 -07:00
Mrunal Patel e5e603f26f Merge pull request #407 from vbatts/annotations
config: clarify annotations sentence
2016-04-28 14:46:15 -07:00
Mrunal Patel 15bddb9311 Merge pull request #409 from RobDolinMS/patch-17
[ Configuration | Version ] Capitalize MUST in ociVersion description
2016-04-28 14:45:56 -07:00
Rob Dolin (MSFT) 646868f7d4 [ Configuration | Version ] Capitalize MUST in ociVersion description
"ociVersion ... must be in SemVer ... format" --> "ociVersion ... MUST be in SemVer ... format"

Signed-off-by: Rob Dolin <RobDolin@microsoft.com>
2016-04-28 12:42:12 -07:00
W. Trevor King 440fc5b36e specs-go/config: Make Spec.Mounts omitempty (#408)
* specs-go/config: Make Spec.Mounts omitempty

Otherwise:

  $ ocitools generate --mount-cgroups=no --template <(echo {})
  $ grep mounts config.json
          "mounts": null,

The language in config.md#Mounts is:

> You can add array of mount points...

which I think means 'MAY'.

Signed-off-by: W. Trevor King <wking@tremily.us>

* config: Use 'MAY' (RFC 2119) for mounts

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-04-28 09:46:54 -04:00
Vincent Batts e6427cb043 Merge pull request #349 from vbatts/target-install-tools
Makefile: add target for tools
2016-04-27 13:31:59 -04:00
Vincent Batts 647d77b700 Merge pull request #401 from RobDolinMS/patch-14
[ Runtime | State] Fix typo
2016-04-27 13:30:39 -04:00
Vincent Batts c4b846c442 travis: use the Makefile targets
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2016-04-27 13:16:20 -04:00
Vincent Batts cc89c12b31 Makefile: add target for tools
As we have several tools used in the Makefile, might as well make them
easier to install.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2016-04-27 13:11:59 -04:00
Vincent Batts 0315202c12 config: clarify annotations sentence
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2016-04-27 11:40:57 -04:00
Vincent Batts dc8aeb1f15 Merge pull request #400 from RobDolinMS/patch-13
[ReadMe] Consistent indented portions of Table of Contents
2016-04-27 09:49:15 -04:00
Rob Dolin (MSFT) 063eb099ac [ Runtime | State] Fix typo
propeties --> properties

Signed-off-by: Rob Dolin <RobDolin@microsoft.com>
2016-04-26 17:49:31 -07:00
Rob Dolin (MSFT) d791113001 [ReadMe] Consistent indented portions of Table of Contents
Signed-off-by: Rob Dolin <RobDolin@microsoft.com>
2016-04-26 15:33:33 -07:00
Qiang Huang f955d90e70 Merge pull request #396 from mrunalp/fix_process_label
Fix remnants from SelinuxProcessLabel to SelinuxLabel rename
2016-04-25 14:50:23 +08:00
Mrunal Patel e87d7d2ba9 Fix remnants from SelinuxProcessLabel to SelinuxLabel rename
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-04-22 13:51:31 -07:00
Vincent Batts 6e08c6983e Merge pull request #393 from mrunalp/mount_label
Add support for Selinux mount context labels
2016-04-22 16:43:00 -04:00
Mrunal Patel 7350d5e1f1 Add support for Selinux mount context labels
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-04-22 13:40:49 -07:00
Mrunal Patel 92af03779e Merge pull request #394 from mlaventure/abs-rootfs-path
Remove requirement for rootfs path to be relative
2016-04-22 12:02:27 -07:00
Kenfe-Mickael Laventure b2e9154a31 Remove requirement for rootfs path to be relative
Closes #389

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-04-22 11:57:21 -07:00
Michael Crosby 77021d955d Merge pull request #390 from wking/example-move-id-mapping-from-process-to-linux
config: Move (u|g)idMappings from 'process' to 'linux'
2016-04-21 09:34:35 -07:00
Vincent Batts b185d033e9 Merge pull request #392 from hqhq/hq_edit_gitignore
Add schema/validate to .gitignore
2016-04-21 11:32:55 -04:00
Qiang Huang 93ea424095 Add schema/validate to .gitignore
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-04-21 09:39:47 +08:00
Vincent Batts 48428a49ff Merge pull request #375 from RobDolinMS/patch-11
ReadMe: Link to shared Code of Conduct in TOB repo
2016-04-20 13:36:36 -04:00
W. Trevor King cf55cdc8c4 config: Move (u|g)idMappings from 'process' to 'linux'
To match where they're defined in the JSON Schema [1].  The old
location is from d4e7326d (config: JSON examples, 2016-04-06, #370),
and seems to have been accidental.

[1]: 0982071b28/schema/schema-linux.json (L21-L48)

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-04-19 22:20:38 -07:00
Mrunal Patel 0982071b28 Merge pull request #388 from vishh/exec
Remove exec from required runtime functionalities.
2016-04-19 17:56:10 -07:00
Vishnu kannan a7a366b334 Remove exec from required runtime functionalities.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-04-19 15:27:23 -07:00
Mrunal Patel 9d3aef58a7 Merge pull request #385 from hqhq/hq_fix_schema_readme
Fix example in schema README
2016-04-15 12:24:39 -07:00
Vincent Batts 9d1998240a Merge pull request #386 from duglin/editMakefile
Hide output dir from git
2016-04-14 21:56:32 -04:00
Doug Davis e284801c4b Hide output dir from git
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-04-14 01:33:21 -07:00
Qiang Huang aaf05c4dc9 Modify README to keep consistency with Makefile
Use the name `validate` instead of `schema` for the
utility.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-04-14 12:33:17 +08:00