Commit Graph

786 Commits

Author SHA1 Message Date
Michael Crosby c9a95ed809 Merge pull request #613 from RobDolinMS/patch-13
[Config Linux] Consistent size values in example
2016-11-10 09:34:46 -08:00
Rob Dolin (MSFT) 675a67dc17 [Config Linux] Consistent size values in example
Matches the example in config.md

Signed-off-by: Rob Dolin <robdolin@microsoft.com>
2016-11-08 13:44:16 -08:00
Daniel, Dao Quang Minh f815650e67 Merge pull request #608 from hqhq/fix_format_issues
Fix several format issues found by pdf and html
2016-11-08 02:21:10 +00:00
Daniel, Dao Quang Minh 2d49cf4333 Merge pull request #610 from vapier/master
schema: update major/minor types
2016-11-07 18:22:23 +00:00
Qiang Huang 0afa59ff1a Merge pull request #609 from wking/absolute-mount-destination
config: Require absolute mount destinations
2016-11-07 13:59:13 +08:00
Qiang Huang 0df2586f03 Merge pull request #518 from mrunalp/terminal
Clarify wording for terminal setting and /dev/console
2016-11-07 09:49:28 +08:00
Mike Frysinger 7872d3ddff schema: update major/minor types
This matches the config-linux.md spec which says these are both int64.

Signed-off-by: Mike Frysinger <vapier@chromium.org>
2016-11-04 20:10:56 -04:00
W. Trevor King 40a5d985df config: Require absolute mount destinations
'destination' has been the path inside the container since c18c283a
(Change layout of mountpoints and mounts, 2015-09-02, #136).  My
personal preference is to have an explicit pivot root and allow paths
relative to the current working directory [1], but that would be a big
shift from the current OCI spec.  The only way the current spec lets
you turn off the root pivot is by not setting a mount namespace at all
(and even then, it's not clear if that turns off the pivot).  And the
config's root entry is required (despite my attempts to have it made
optional [2]), so it's not really clear how containers that don't set
a mount namespace are supposed to work (if they're supported at all).

You might be able to get away with something like:

  When a mount namespace is not set, destination paths are relative to
  the runtime's initial working directory (or relative to the
  config.json, or whatever).  When a mount namespace is set,
  destination paths are relative to the mount namespace's root.

but with mount-namespace-less containers already so unclear, it seems
better to just require absolute destinations.  If/when we get clearer
support for explicit pivot-root calls or containers that inherit the
host mount namespace (without re-joining it and losing their old
working directory), we can consider lifting the absolute-path
restriction.

[1]: https://github.com/wking/ccon/tree/v0.4.0#mount-namespace
[2]: https://groups.google.com/a/opencontainers.org/forum/#!topic/dev/6ZKMNWujDhU
     Date: Wed, 26 Aug 2015 12:54:47 -0700
     Subject: Dropping the rootfs requirement and restoring arbitrary bundle
       content
     Message-ID: <20150826195447.GX21585@odin.tremily.us>

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-11-03 23:20:40 -07:00
Qiang Huang 661314a926 Fix several format issues found by pdf and html
This carries #578 and fixes some other format issues.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-11-03 09:33:51 +08:00
Michael Crosby 41ef05e714 Merge pull request #605 from WeiZhang555/fix-typo
Fix typo: ammended -> amended
2016-11-02 09:24:41 -07:00
Zhang Wei 4da20ce97a Fix typo: ammended -> amended
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-11-01 16:32:27 +08:00
Qiang Huang b8e2ebec5f Merge pull request #597 from WeiZhang555/fix-duplicated-namespaces
Forbid duplicated namespaces with same `type`.
2016-11-01 11:42:41 +08:00
Mrunal Patel dc42b45811 Merge pull request #601 from hqhq/rewrite_idmapping
Rewrite LinuxIDMappings
2016-10-31 13:58:45 -07:00
Michael Crosby 32aa94ecbe Merge pull request #586 from Mashimiao/specs-config-fix-required-type
specs-go/config: fix required items type
2016-10-31 13:44:03 -07:00
Ma Shimiao ef9ce84cf9 specs-go/config: fix required items type
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2016-10-31 09:18:11 +08:00
Qiang Huang e91c55e9a1 Merge pull request #603 from coolljt0725/typo
typo: fix missing `)`
2016-10-29 14:26:51 +08:00
Lei Jitang a83c0965b2 typo: fix missing `)`
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-10-28 03:41:44 -04:00
Qiang Huang 4404abf6cb Consistent wording for parameters in array and object
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-10-28 15:09:05 +08:00
Vincent Batts 28c6afea8b Merge pull request #600 from hqhq/fix_typos
Fix some typos
2016-10-28 01:11:18 +00:00
Michael Crosby ac2317aa7e Merge pull request #599 from hqhq/use_IO
Use IO instead of io
2016-10-27 10:05:50 -07:00
Qiang Huang 621684f645 Rewrite LinuxIDMappings
Basicly make the format consistent with others, no
semantics change.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-10-27 19:00:39 +08:00
Qiang Huang f37cd3a903 Fix some typos
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-10-27 18:00:08 +08:00
Qiang Huang 2379be75cb Use IO instead of io
For consistency, while all other places use IO.

$ grep -rnIw IO * | wc -l
10

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-10-27 16:10:02 +08:00
Zhang Wei c22eeb2197 Forbid duplicated namespaces with same `type`.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-10-27 11:25:43 +08:00
Qiang Huang 81888fe633 Merge pull request #584 from wking/json-object-no-order-or-duplicates
glossary: Make objects explicitly unordered and forbid duplicate names
2016-10-27 09:37:01 +08:00
Vincent Batts 6dfc682237 Merge pull request #587 from Mashimiao/config-fix-and-value-require-paths
config-linux: fix format and definitely require value of masked and r…
2016-10-25 17:13:31 +00:00
Michael Crosby 1e7faf0c4c Merge pull request #596 from WeiZhang555/add-related-links
Add some related docs links
2016-10-25 09:11:38 -07:00
Michael Crosby 63467b2832 Merge pull request #595 from WeiZhang555/typo
Fix typo
2016-10-25 09:09:48 -07:00
Zhang Wei 98f0bdfe70 Add some related docs links
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-10-25 20:52:31 +08:00
Zhang Wei 932fba6802 Fix typo
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-10-25 16:59:26 +08:00
Mrunal Patel 52f3cdecd1 Clarify wording for terminal setting and /dev/console
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-10-19 10:22:05 -07:00
Mrunal Patel d6d6839638 Merge pull request #589 from wking/golint-requires-go-1.6
Makefile: Require Go >= 1.6 for golint
2016-10-18 12:57:47 -07:00
W. Trevor King a9c0235304 Makefile: Require Go >= 1.6 for golint
golint dropped support for Go 1.5 [1].

[1]: a428635c58
     Drop support for Go 1.5, 2016-09-15

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-10-12 21:45:55 -07:00
Michael Crosby a39be468c9 Merge pull request #567 from jhowardmsft/jjh/aggressivenamespacing
Aggressive namespacing
2016-09-30 09:46:08 -07:00
Ma Shimiao 25f44dd0e8 config-linux: fix format and definitely require value of masked and readonly paths
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2016-09-30 13:51:00 +08:00
Mrunal Patel 508cd2734f Merge pull request #585 from wking/ocitools-rename
implementations: Rename ocitools -> runtime-tools
2016-09-29 13:02:05 -07:00
W. Trevor King d985738f44 implementations: Rename ocitools -> runtime-tools
And re-alphabetize.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-09-28 14:56:33 -07:00
W. Trevor King eeaccfabf9 glossary: Make objects explicitly unordered and forbid duplicate names
Pin down our JSON definition to a particular RFC (which we can
explicitly bump if neccessary), instead of referencing the floating
JSON homepage.

Explicitly make objects unordered and forbid duplicate names to avoid
relying on unportable behavior.  RFC 7159 is a bit more relaxed [1]:

  The names within an object SHOULD be unique.

but warns [1]:

  An object whose names are all unique is interoperable in the sense
  that all software implementations receiving that object will agree
  on the name-value mappings.  When the names within an object are not
  unique, the behavior of software that receives such an object is
  unpredictable.  Many implementations report the last name/value pair
  only.  Other implementations report an error or fail to parse the
  object, and some implementations report all of the name/value pairs,
  including duplicates.

The RFC also warns about order portability [1]:

  JSON parsing libraries have been observed to differ as to whether or
  not they make the ordering of object members visible to calling
  software.  Implementations whose behavior does not depend on member
  ordering will be interoperable in the sense that they will not be
  affected by these differences.

And has some (informative?) language about entries being unordered
[2]:

  An object is an unordered collection of zero or more name/value
  pairs...

[1]: https://tools.ietf.org/html/rfc7159#section-4
[2]: https://tools.ietf.org/html/rfc7159#section-1

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-09-27 09:23:17 -07:00
Vincent Batts 1c7c27d043 Merge pull request #573 from jhowardmsft/jjh/addwindows
Add support for Windows based containers
2016-09-26 16:19:32 -04:00
John Howard dc8f2c2e6e Add support for Windows-based containers
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-22 12:13:04 -07:00
Mrunal Patel c356a80b36 Merge pull request #563 from jhowardmsft/jjh/initialconsolesize
config: Add consoleSize to process
2016-09-21 12:29:30 -07:00
Qiang Huang d850760444 Merge pull request #575 from jhowardmsft/jjh/definitions
README: Define 'unspecified', 'undefined', and 'implementation-defined'
2016-09-21 11:19:06 +08:00
John Howard a502caf65f config: Add consoleSize to process
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-20 15:19:27 -07:00
John Howard e918daac26 Aggressive namespacing
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-20 15:05:29 -07:00
Mrunal Patel 313f40bdfc Merge pull request #559 from wking/create-bail-for-unsupported-config
runtime.md: Require 'create' to fail if config.json asks for the impossible
2016-09-20 14:29:59 -07:00
Mrunal Patel 67063b5a7e Merge pull request #574 from wking/config-optional-required
config: Use REQUIRED and OPTIONAL for properties
2016-09-20 14:27:04 -07:00
Mrunal Patel 37dbfc3a23 Merge pull request #572 from jhowardmsft/jjh/typo
Fix typo 'unkown'
2016-09-20 14:22:36 -07:00
Mrunal Patel 7bce59f225 Merge pull request #564 from jhowardmsft/jjh/processplatformtags
Platform annotations on `Process` struct
2016-09-20 14:18:47 -07:00
John Howard cef511fa6a README: Define 'unspecified', 'undefined', and 'implementation-defined'
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-19 13:22:03 -07:00
W. Trevor King d49c29f042 config: Replace "required" with "REQUIRED"
In all of these cases we want to use the RFC 2119 semantics.
Generated with:

  $ sed -i 's/required/REQUIRED/g' config*.md

after which I rolled back the change for:

  ...controllers required to fulfill...

since that was already MUSTed.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-09-17 22:03:26 -07:00