Commit Graph

83 Commits

Author SHA1 Message Date
Michael Crosby 8718f81b67 Merge pull request #80 from laijs/fix-mappings-description
specs: fix the description for the [ug]idMappings
2015-07-27 09:06:23 -07:00
Michael Crosby e92fa189e1 Merge pull request #77 from laijs/convert-oc-to-runc
runtime.md: convert oc to runc
2015-07-27 09:05:24 -07:00
Alexander Morozov ee14acd1da Merge pull request #81 from laijs/align-graph
specs: align the ascii graph
2015-07-27 08:38:06 -07:00
Alexander Morozov f8fe0c0c1f Merge pull request #78 from laijs/rename-ocp
spec: rename ocp to oci and add a link
2015-07-27 08:27:56 -07:00
Lai Jiangshan 94d93ec010 specs: align the ascii graph
The three files/directory are at the same level in the bundle directory,
they should be aligned.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2015-07-26 16:38:17 +08:00
Lai Jiangshan d485f77fbd specs: fix the description for the [ug]idMappings
The fields in the [ug]idMappings are changed, we should fix
the description correspondingly.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2015-07-26 16:30:59 +08:00
Lai Jiangshan 012bf95040 spec: rename ocp to oci and add a link
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2015-07-26 16:24:01 +08:00
Lai Jiangshan 33cb754a79 runtime.md: convert oc to runc
"oc" is too short to understand here, "runc" seems better.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2015-07-26 14:58:38 +08:00
Alexander Morozov 5c98addb2b Merge pull request #71 from rootfs/master
make rootfs mount propagation mode settable
2015-07-17 08:56:33 -07:00
Huamin Chen c53bf87ac2 make rootfs mount propagation mode settable
Signed-off-by: Huamin Chen  <hchen@redhat.com>
2015-07-16 08:50:11 -04:00
Mrunal Patel fb8706c9df Merge pull request #67 from jhjeong-kr/master
typo: containers -> container's
2015-07-10 08:10:33 -07:00
Jin-Hwan Jeong c39cad5aad typo: containers -> container's
Signed-off-by: Jin-Hwan Jeong <jhjeong.kr@gmail.com>
2015-07-10 18:23:13 +09:00
Mrunal Patel 30d607aa38 Merge pull request #63 from wking/clarify-idmapping-fields
spec_linux.go: Rename IDMapping fields to follow syscall.SysProcIDMap
2015-07-09 11:45:40 -07:00
Brandon Philips 61e5579768 Merge pull request #61 from titanous/patch-1
Fix Windows path escaping in example mount JSON
2015-07-09 12:31:37 -06:00
Brandon Philips 0306f43e1b Merge pull request #54 from crosbymichael/license
Add license and DCO information for contributions
2015-07-08 17:44:44 -06:00
W. Trevor King 0887300359 spec_linux.go: Rename IDMapping fields to follow syscall.SysProcIDMap
'From' and 'To' are potentially ambiguous for a one-to-one map like
this, and there's already an established name convention in
SysProcIDMap [1].  This commit removes the mental overhead of two
separate naming schemes for the same information.  I'd like to drop
IDMapping entirely in favor of SysProcIDMap, but SysProcIDMap doesn't
give the JSON hints we need for (de)serializing.

[1]: https://golang.org/pkg/syscall/#SysProcIDMap
2015-07-08 10:48:51 -07:00
Michael Crosby e8990d65d1 Merge pull request #50 from mrunalp/userns_section
Adds a section for user namespace mappings
2015-07-08 09:28:18 -07:00
Jonathan Rudenberg 19cb6c7de9 Fix Windows path escaping in example mount JSON 2015-07-07 17:52:27 +00:00
Michael Crosby e45054b038 Merge pull request #60 from jonboulle/master
config: minor cleanup
2015-07-07 09:27:58 -07:00
Jonathan Boulle 625798536e config: minor cleanup
- link to official SemVer page
- link between config.md and config-linux.md and explain relationship
- fix typo (arch -> os)
- tweak formatting of some special characters
2015-07-06 17:37:01 -07:00
Mrunal Patel d8237f1899 Adds a section for user namespace mappings
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-07-06 16:05:05 -04:00
Michael Crosby 8fa5eb040a Merge pull request #59 from mrunalp/sysctl
Rename SystemProperties to Sysctl
2015-07-06 13:04:33 -07:00
Mrunal Patel 83003b6d25 Rename SystemProperties to Sysctl
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-07-06 13:57:37 -04:00
Mrunal Patel c604beacfc Merge pull request #55 from jonboulle/master
bundle.md: various updates to latest spec
2015-07-06 10:05:03 -07:00
Michael Crosby 554ea258d3 Merge pull request #58 from lizf-os/support-memory-swappiness
Add memory swappiness to linux spec
2015-07-06 09:49:08 -07:00
Zefan Li 09dff758c4 Add memory swappiness to linux spec
Signed-off-by: Zefan Li <lizefan@huawei.com>
2015-07-06 10:54:28 +08:00
Jonathan Boulle 112dcbb6a9 bundle.md: clarify arbitrary/conventional dirnames
Add a note describing that the names of directories in the bundle are
arbitrary and referenced from the configuration, but conventional names
(like "rootfs" and "signatures") should be used.
2015-07-02 17:50:49 -07:00
Jonathan Boulle 91f5ad7cfa bundle.md: various updates to latest spec
- Move to single root filesystem, as the configuration specification now
  only supports a single process
- Clarify that signatures are just another kind of content directory
- Cross-reference configuration specification for config.json
2015-07-02 17:36:09 -07:00
Alexander Morozov d803cc18a3 Merge pull request #53 from jonboulle/master
config.md: update links to spec schema code
2015-07-02 14:20:42 -07:00
Jonathan Boulle 7f2ff75576 config.md: update links to spec schema code 2015-07-02 14:18:26 -07:00
Michael Crosby 84707b0843 Add license and DCO information for contributions
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-07-02 13:56:14 -07:00
Mrunal Patel 89fbfc1729 Merge pull request #51 from crosbymichael/addtypes
Add Go types for specification
2015-07-02 12:04:08 -07:00
Michael Crosby 238800f9c8 Add Go types for specification
This adds Go types implementing the configuration specification.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-07-02 11:40:16 -07:00
Brandon Philips 3e6d666428 Merge pull request #49 from jonboulle/master
config.md: various cleanup/consistency fixes
2015-07-01 14:10:04 -07:00
Jonathan Boulle bd2fd1a8df config.md: various cleanup/consistency fixes
- standardise on "filesystem" instead of the previous mix of "file
  system" and "filesystem"
- change "Machine-specific" to the more accurate "Platform-specific"
- move towards zeroth article for all field specifications
- grammar tweaks
2015-07-01 11:43:43 -07:00
Mrunal Patel df70ac02bd Merge pull request #48 from jonboulle/foo
*: small spelling fixes
2015-07-01 10:22:51 -07:00
Jonathan Boulle 1937c009ea *: small spelling fixes 2015-07-01 10:20:43 -07:00
Mrunal Patel ce1a02f1da Merge pull request #47 from jonboulle/procs
config.md: minor clean up of process specification
2015-07-01 10:03:19 -07:00
Brandon Philips 31d598f9ed Merge pull request #46 from jonboulle/master
bundle.md: fix off-by-one error
2015-07-01 09:58:52 -07:00
Jonathan Boulle 2f854b20dd config.md: minor clean up of process specification
- Standardise on singular rather than plural
- Small formatting fixes
2015-07-01 09:58:39 -07:00
Jonathan Boulle d29a2e0465 bundle.md: fix off-by-one error 2015-07-01 09:53:15 -07:00
Mrunal Patel 3b7d3445bb Merge pull request #45 from lizf-os/fix-typos-in-rlimits
Fix typos in the rlimits section
2015-06-30 19:35:33 -07:00
lizf-os a402b7ae4e Fix typos in the rlimits section
Signed-off-by: Zefan Li <lizefan@huawei.com>
2015-07-01 10:25:46 +08:00
Brandon Philips 7b43ad727c config.md: make the version field example a semver 2015-06-30 17:48:05 -07:00
Michael Crosby b3918a259f Add bind mount example
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-06-30 16:08:52 -07:00
Brandon Philips aa7e14306b Merge pull request #35 from mrunalp/rlimits
Adds section for Linux Rlimits
2015-06-30 16:04:05 -07:00
Brandon Philips ad212eeebd Merge pull request #36 from mrunalp/cgroups_link
Adds link to kernel cgroups documentation
2015-06-30 16:03:52 -07:00
Brandon Philips 9c90ccdb93 config.md: make the version a semver
As suggested in #15 make this a semver so we have some interpretation of
compatibility.
2015-06-30 16:02:52 -07:00
Michael Crosby 8af3eb64b2 Specific platform specific user struct for spec
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-06-30 15:58:47 -07:00
Mrunal Patel a4df2e4ad5 Adds link to kernel cgroups documentation
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-06-30 18:45:10 -04:00