Commit Graph

707 Commits

Author SHA1 Message Date
Mrunal Patel 7cdb70fc35 Merge pull request #436 from wking/remove-solaris-from-full-config
config.md: Remove 'solaris' from full example
2016-05-18 10:09:59 -07:00
Mrunal Patel 3220f194cf Merge pull request #435 from wking/roadmap-cleanup
ROADMAP: Remove stale targets (landed PRs, image-spec, ocitools, etc.)
2016-05-18 07:12:35 -07:00
W. Trevor King a044e07006 config.md: Remove 'solaris' from full example
This should have been part of 759ee79c (config: Add
platform-specific entry for 'solaris', 2016-05-06, #431), since
the example has platform.os set to 'linux'.

There was some (brief) discussion of this point before the 'solaris'
section landed [1], but the "should only be set if" wording landed in
parallel via b373a15 (config: Split platform-specific configuration
into its own section, 2016-05-02, #414), and I'd forgotten to go back
and apply that logic to #411.

Having a full Solaris example would be useful, but I think it should
be a separate, Solaris-only example.

[1]: https://github.com/opencontainers/runtime-spec/pull/411#discussion_r61621001

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-15 23:05:53 -07:00
W. Trevor King 23e03f9de3 ROADMAP: Remove stale targets (landed PRs, image-spec, ocitools, etc.)
# digest/hashing target

Most of this has spun off with [1], and I haven't heard of anyone
talking about verifying the on-disk filesystem in a while.  My
personal take is on-disk verification doesn't add much over serialized
verification unless you have a local attacker (or unreliable disk),
and you'll need some careful threat modeling if you want to do
anything productive about the local attacker case.  For some more
on-disk verification discussion, see the thread starting with [2].

# distributable-format target

This spun off with [1].

# lifecycle target

I think this is resolved since 7713efc1 (Add lifecycle for containers,
2015-10-22, #231), which was committed on the same day as the ROADMAP
entry (4859f6da, Add initial roadmap, 2015-10-22, #230).

# container-action target

Addressed by 7117ede7 (Expand on the definition of our ops,
2015-10-13, #225), although there has been additional discussion in
a7a366b3 (Remove exec from required runtime functionalities,
2016-04-19, #388) and 0430aaf1 (Split create and start, 2016-04-01,
#384).

# validation and testing targets

Validation is partly covered by cdcabdeb (schema: JSON Schema and
validator for `config.json`, 2016-01-19, #313) and subequent JSON
Schema work.  The remainder of these targets are handled by ocitools
[3].

# printable/compiled-spec target

The bulk of this was addressed by 4ee036fc (*: printable documents,
2015-12-09, #263).  Any remaining polishing of that workflow seems
like a GitHub-issue thing and not a ROADMAP thing.  And publishing
these to opencontainers.org certainly seems like it's outside the
scope of this repository (although I think that such publishing is a
good idea).

[1]: https://github.com/opencontainers/image-spec
[2]: https://groups.google.com/a/opencontainers.org/d/msg/dev/xo4SQ92aWJ8/NHpSQ19KCAAJ
     Subject: OCI Bundle Digests Summary
     Date: Wed, 14 Oct 2015 17:09:15 +0000
     Message-ID: <CAD2oYtN-9yLLhG_STO3F1h58Bn5QovK+u3wOBa=t+7TQi-hP1Q@mail.gmail.com>
[3]: https://github.com/opencontainers/ocitools

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-15 15:21:43 -07:00
Qiang Huang be7676409b Merge pull request #429 from wking/terminal-omitempty
specs-go/config.go: Make Process.Terminal omitempty
2016-05-10 17:23:43 +08:00
Qiang Huang d33a8e17cb Merge pull request #430 from wking/readonly-omitempty
specs-go/config.go: Make Root.Readonly omitempty
2016-05-10 17:21:30 +08:00
Mrunal Patel adea03f51c Merge pull request #431 from wking/platform-specific-solaris
specs-go/config: Make Linux and Solaris omitempty
2016-05-09 13:18:46 -07:00
Vincent Batts 040712af18 Merge pull request #428 from wking/tk/system-pandoc
Makefile: Replace vbatts/pandoc with a PANDOC variable
2016-05-07 17:50:35 +02:00
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
W. Trevor King f307cfc939 specs-go/config.go: Make Root.Readonly omitempty
It's an optional setting, and this change will fix the wordy:

  $ ocitools generate --template <(echo '{}')
  $ grep readonly config.json
      "readonly": false,

Instead, config.json will not contain a 'readonly' entry at all.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-06 22:16:10 -07:00
W. Trevor King 41e94ae3d5 specs-go/config.go: Make Process.Terminal omitempty
It's an optional setting, and this change will fix the wordy:

  $ ocitools generate --template <(echo '{}')
  $ grep terminal config.json
      "terminal": false,

Instead, config.json will not contain a 'terminal' entry at all.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-06 21:38:23 -07:00
W. Trevor King dc9daf9e58 Makefile: Replace vbatts/pandoc with a PANDOC variable
Defaulting to whichever PANDOC is first in your path.  This mirrors
the existing DOCKER handling.  Folks who want to use the old path can
run:

  $ make PANDOC=vbatts/pandoc ...

I'm not sure why 4ee036fc (*: printable documents, 2015-12-09, #263)
went with a variable for 'docker' but a hard-coded path for 'pandoc'.
I expect it was just oversight.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-06 14:51:06 -07:00
W. Trevor King 1ac46cbd9f Makefile: Use 'command -v' instead of 'which'
The former is in POSIX [1], but the latter is not [2].

[1]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
[2]: http://pubs.opengroup.org/onlinepubs/9699919799/idx/utilities.html

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-06 14:48:40 -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 d7b5e15566 runtime: Explicitly allow 'start' to not validate config.json
This spec places RFC-2119 requirements on both bundles (bundle.md,
config.md, ...)  and runtimes (runtime.md, runtime-linux.md).  While
it's possible to envision a system where bundle validation is required
before container setup begins, it is also possible to decoupled
validation and allow the runtime to blindly stumble through as far as
it can.

We already link to ocitools and OCT for testing both runtimes and
bundles [1], so users interested in pre-start validation can use those
tools.

This commit explicitly documents the non-requirement and links to
those tools, to make life less surprising for everybody.

[1]: https://github.com/opencontainers/runtime-spec/blob/v0.5.0/implementations.md#testing--tools

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-02 11:58:31 -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