jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
812 Commits 5 Branches 25 Tags 17 MiB
Commit Graph

812 Commits

Author SHA1 Message Date
Vincent Batts 794ca7ac88
version: release rc3 
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2016-12-12 13:42:06 -05:00
W. Trevor King c58e64507a ChangeLog: Document changes since v1.0.0-rc2 
Through d12da90 (Merge pull request #633 from
WeiZhang555/syncup-hook-state, 2016-12-06).

Signed-off-by: W. Trevor King <wking@tremily.us>
 2016-12-07 13:41:40 -08:00
Vincent Batts d12da90232 Merge pull request #633 from WeiZhang555/syncup-hook-state 
Rename `version` to `ociVersion` according to runtime.md
 2016-12-06 11:10:37 -05:00
Zhang Wei c8f5a56909 Rename `version` to `ociVersion` according to runtime.md 
According to definition of [state](runtime.md#State), we should rename
`version` field in `state.go` to `ociVersion`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-11-29 15:44:03 +08:00
Mrunal Patel 9ce258d034 Merge pull request #629 from wking/code-to-program 
*: Replace “user-specified code” with “user-specified program”
 2016-11-23 06:18:14 -08:00
W. Trevor King c45ffb4ce7 *: Replace "user-specified code" with "user-specified program" 
In [1], I'd proposed replacing our old "user-specified process" with
"user-specified code" to help distinguish between 'create' (cloning
the container process) and 'start' (signaling the container process to
execve or similar the user-specified $STUFF_FROM_THE_process_CONFIG).
That PR was rejected, although the renaming proposed there had already
landed via dd0cd210 (Add a 'status' field to our state struct,
2016-05-26, #462).

This PR attempts to find a common ground between "process" (preferred
by maintainers in #466 [2,3,4], but which I consider incorrect [5])
and "code" (which maintainers found confusing [3,4,6]).  The Linux
execve(2) says "program" and unpacks that to "a binary executable, or
a script starting with a [shebang]" [7].  proc(5) documents
/proc/[pid]/exe by talking about "the executed command" [8].  The
POSIX exec docs call this the "process image" and talk about loading
it from the "new process image file" (although they also sprinkle in a
number of “program” references, apparently interchangeably with
“process image”) [9].

POSIX formally defines "command" [11], "executable file" [12], and
"program" [13].  The only reference to "process image" in the
definitions is in the "executable file" entry.  The "command"
definition is focused on the shell, the "executable file" definition
is focused on files, and the "program" definition talks about a
"prepared sequence of instructions to the system", so "program" seems
like the best fit.

[1]: https://github.com/opencontainers/runtime-spec/pull/466
     Subject: runtime: Replace "user-specified process" with "user-specified code" in 'create'
[2]: https://github.com/opencontainers/runtime-spec/pull/466#r64982402
[3]: https://github.com/opencontainers/runtime-spec/pull/466#issuecomment-223132793
[4]: https://github.com/opencontainers/runtime-spec/pull/466#issuecomment-258563220
[5]: http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_295
[6]: https://github.com/opencontainers/runtime-spec/pull/466#r64982165
[7]: http://man7.org/linux/man-pages/man2/execve.2.html
[8]: http://man7.org/linux/man-pages/man5/proc.5.html
[9]: http://pubs.opengroup.org/onlinepubs/9699919799/functions/exec.html
[10]: https://git.kernel.org/cgit/docs/man-pages/man-pages.git/
[11]: http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_104
[12]: http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_154
[13]: http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_306

Signed-off-by: W. Trevor King <wking@tremily.us>
 2016-11-18 03:42:10 -08:00
Mrunal Patel 7839cbb5dc Merge pull request #626 from duglin/specCleanup 
Cleanup the spec a bit to remove WG/git text that's not really part of the spec
 2016-11-16 10:47:59 -08:00
Doug Davis e7be40f0c3 Cleanup the spec a bit to remove WG/git text that's not really part of the spec 
renamed an href to "container-namespace2" to avoid a dup-warning msg from
the PDF generator

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-11-16 09:50:03 -08:00
Mrunal Patel ee5a5650c7 Merge pull request #621 from wking/output-dirname-trailing-slash 
Makefile: Remove trailing slash from OUTPUT_DIRNAME value
 2016-11-15 12:08:38 -08:00
Qiang Huang 600b8b4616 Merge pull request #619 from wking/tk/process-header 
config: Change “Process configuration” → “Process” header
 2016-11-15 14:33:21 +08:00
Qiang Huang b69dcba704 Merge pull request #617 from wking/process.terminal-optional-case 
config: Fix 'optional' -> 'OPTIONAL' for process.terminal
 2016-11-15 14:30:55 +08:00
Daniel, Dao Quang Minh 780fc67f04 Merge pull request #622 from wking/rfc-2119-wording 
README: Use recommended RFC 2119 wording
 2016-11-14 18:08:49 -08:00
Daniel, Dao Quang Minh 44c6543470 Merge pull request #623 from wking/no-solaris-uid-gid-note 
config: Drop Solaris UID/GID note
 2016-11-14 18:06:29 -08:00
Daniel, Dao Quang Minh f6b9850fea Merge pull request #624 from wking/windows-optional-case 
config: Fix 'optional' -> 'OPTIONAL' for 'windows'
 2016-11-14 18:05:03 -08:00
Daniel, Dao Quang Minh 176fe8013c Merge pull request #625 from Mashimiao/spec-config-comment-fix 
spec-go/config: comment fix
 2016-11-14 18:03:56 -08:00
Daniel, Dao Quang Minh d7e87ca6d9 Merge pull request #627 from jonboulle/master 
README: remove extraneous apostrophe
 2016-11-14 17:55:52 -08:00
Jonathan Boulle 4476954bbd README: remove extraneous apostrophe 
Also s/OpenContainers/OCI/ as used in the image-spec README.

Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
 2016-11-15 10:13:21 +09:00
Ma Shimiao f305e643dc spec-go/config: comment fix 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2016-11-14 16:14:22 +08:00
W. Trevor King a208e446e7 config: Fix 'optional' -> 'OPTIONAL' for 'windows' 
The shift happened in c35cf573 (config: Replace "optional" with
"OPTIONAL", 2016-09-17, #574) and the 'windows' entry landed in
parallel with dc8f2c2 (Add support for Windows-based containers,
2016-09-16, #573).

Signed-off-by: W. Trevor King <wking@tremily.us>
 2016-11-13 21:52:02 -08:00
W. Trevor King afb9a75e73 config: Drop Solaris UID/GID note 
The note is from 7c9daeba (Introducing Solaris in OCI, 2016-04-25,
#411), but as I pointed out there [1], this is also true for Linux.
08908d6f (config: Explicit container namespace for uid, gid, and
additionalGids, 2016-04-29, #412) landed in parallel with more
explicit namepacing for these fields, so we no longer need the
overly-specific Solaris note.

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

Signed-off-by: W. Trevor King <wking@tremily.us>
 2016-11-13 21:27:10 -08:00
W. Trevor King af7a94dbfe README: Use recommended RFC 2119 wording 
Match the recommendation in the RFC's abstract [1].  Also bump
"keywords" -> "key words" in the subsequent C99 sentence for
consistency.

[1]: https://tools.ietf.org/html/rfc2119

Signed-off-by: W. Trevor King <wking@tremily.us>
 2016-11-10 22:29:57 -08:00
W. Trevor King 5a035d534c Makefile: Remove trailing slash from OUTPUT_DIRNAME value 
This slash gets added back on (e.g. $(OUTPUT_DIRNAME)/) in all the
places where a trailing slash matters.

Signed-off-by: W. Trevor King <wking@tremily.us>
 2016-11-10 21:48:58 -08:00
W. Trevor King bf9694db6e config: Change "Process configuration" -> "Process" header 
All of these sections are about configuration, and we don't usually
use "{Whatever} configuration" in the headers.

Signed-off-by: W. Trevor King <wking@tremily.us>
 2016-11-10 20:43:51 -08:00
W. Trevor King 458d99841c config: Fix 'optional' -> 'OPTIONAL' for process.terminal 
This happened in c35cf573 (config: Replace "optional" with "OPTIONAL",
2016-09-17, #574) but was accidentally rolled back in 52f3cdec
(Clarify wording for terminal setting and /dev/console, 2016-07-18,
#518).

Signed-off-by: W. Trevor King <wking@tremily.us>
 2016-11-10 12:00:59 -08:00
Mrunal Patel cc983bb6f4 Merge pull request #588 from anuthan/solaris 
Mounts in Solaris
 2016-11-10 12:16:42 -07:00
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