Commit Graph

977 Commits

Author SHA1 Message Date
Vincent Batts d5f56f0d9c Merge pull request #753 from wking/tk/remove-env-var-dollars
config: Replace '$GOOS' with 'GOOS', etc.
2017-04-05 10:24:58 -04:00
W. Trevor King 124a819511 config: Replace '$GOOS' with 'GOOS', etc.
Windows' cmd.exe prefers wrapping in % (e.g. %GOOS%) [1], and Rob
Dolin has asked for the POSIX $ to be removed [2].  In this case, I
think the context is sufficient that we can just use the variable name
instead of Rob's recommended "for the environment variable FOO".

[1]: https://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/ntcmds_shelloverview.mspx?mfr=true
[2]: https://github.com/opencontainers/runtime-spec/issues/477#issue-157945714

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-04-04 15:52:59 -07:00
Michael Crosby 18f4f18955 Merge pull request #751 from hqhq/use_MUST_for_weight
Use MUST and MAY for weight and leafWeight
2017-04-03 14:18:18 -07:00
Mrunal Patel d094a5c9c1 Merge pull request #749 from wking/array-of-x
*: Replace "array" type with "array of objects"
2017-03-30 08:03:05 -07:00
Mrunal Patel 99d224cfe5 Merge pull request #752 from q384566678/fix-typo
GOVERNANCE.md: fix typo
2017-03-30 08:01:40 -07:00
zhouhao 4a157998cd GOVERNANCE.md: fix typo
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
2017-03-30 15:14:35 +08:00
Qiang Huang 018c5f20b0 Use MUST and MAY for weight and leafWeight
Carry: #728

Signed-off-by: Rob Dolin <robdolin@microsoft.com>
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2017-03-30 13:01:38 +08:00
W. Trevor King ff207496ab *: Replace "array" type with "array of objects"
We have a few different element types in our arrays, so it's useful to
clarify the element type for the property being specified.  Before
this commit:

  $ sed -n 's|.*\*\*`\([^`]*\)`\*\*[^(]*(\([^,]*\),.*|\2|p' *.md | sort | uniq -c | grep array
        7 array
        1 array of ints
        8 array of objects
       13 array of strings

All of the bare 'array' instances turned out to be arrays of objects.

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-03-29 11:17:32 -07:00
Daniel, Dao Quang Minh 6ca773ae74 Merge pull request #740 from wking/alternating-meetings
README: Document the alternate-week meeting times
2017-03-29 10:27:59 +01:00
Qiang Huang 6e31bc0880 Merge pull request #744 from wking/fix-anchor-for-runtime-implementations
implementations: Fix 'name"..."' -> 'name="..."' runtime anchor
2017-03-28 23:14:25 -05:00
Mrunal Patel 71366eecb5 Merge pull request #741 from q384566678/fix-info
config-linux.md: fix info
2017-03-28 16:30:59 -07:00
W. Trevor King 989aed767a implementations: Fix 'name"..."' -> 'name="..."' runtime anchor
Signed-off-by: W. Trevor King <wking@tremily.us>
2017-03-28 13:49:39 -07:00
Michael Crosby 3adac26772 Merge pull request #706 from q384566678/fix-seecomp
config-linux.md: fix seccomp
2017-03-27 10:24:44 -07:00
zhouhao 8c12f6038c config-linux.md: fix info
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
2017-03-24 14:02:02 +08:00
W. Trevor King 244c2a6a86 README: Document the alternate-week meeting times
On Thu, Mar 09, 2017 at 08:37:55AM -0700, Chris Aniszczyk wrote [1]:
> summarizing the discussion, how about we just alternative the time like
> Jonathan discussed?
>
> I believe that's the only fair thing to do and it's reassuring to hear from
> people like Phil who would be able to make the time along with others.
>
> I'm fine with the current time (1000AEST/1500PST/0000CET) and then
> 0400AEST/0900PST/1800CET

The 8am Pacific time ended up working out better than 9am for Jonathan
and Samuel [2,3], so I've used that instead of 9am.  The 8am slot was
confirmed as the most popular slot in a Doodle poll [4], with the
following folks approving that slot:

* David Lyle
* George Lestaris
* Jonathan Boulle
* Julz
* Michael Crosby
* Mike Brown
* Mrunal Patel
* Phil Estes
* Rob Dolin
* Samuel Ortiz
* Stephen Day
* Stephen Walli
* Vincent Batts
* W. Trevor King

Removing those folks, the second most popular slot is 5pm Pacific,
with the following folks approving that slot:

* Aleksa Sarai
* Keyang Xie
* Lei Jitang
* Ma Shimiao
* Qiang Huang

Stephen and Mrunal approved both slots, and since they frequently
anchor the runtime and image conversations respectively, there should
be sufficient continuity between the two meetings.

The only person voting in the Doodle poll who didn't approve either
slot is Tianon.

Folks with a POSIX ‘date’ command can find the week number with [5]:

  $ date +%V

There may be some doubling up around the end of the year, but we're
usually canceling meetings around then anyway.

The 8am Pacific meeting gets the odd slot because it's Europe-friendly
and lots of folks will be in Europe on 2017-03-29 for KubeCon [6].

I'd be happier with meeting times anchored to UTC to make life easier
for folks outside of the US, but one change at a time ;).

Future bumps to meeting.ics should bump LAST-MODIFIED [7] or DTSTAMP
[8] for any altered components.  We can't use DTSTAMP in the VEVENT
because VEVENTs require DTSTAMP [9].

The timezone entry is based on the America/New_York example from [10].

Figuring out a single RRULE to cover both meeting times was beyond my
abilities, and while RFC 2445 allowed multiple RRULEs in a single
VEVENT [11,12], RFC 5545 does not [13].  Something like:

  RRULE:FREQ=YEARLY;BYDAY=WE;BYHOUR=8,17;BYSETPOS=1,4,5,8,9,...

should be legal (at least for 2017), but Google Calendar [14] doesn't
seem to respect BYHOUR expansion, and ICAL.js [15] doesn't seem to
respect the BYSETPOS limit, so I gave it up and went with two events.

To stick strictly to the ISO weeks we could use:

  RRULE:FREQ=YEARLY;BYDAY=WE;BYWEEKNO=13,15,17,19,21,23,25,27,29,31,33,35,
   37,39,41,43,45,47,49,51

and:

  RRULE:FREQ=YEARLY;BYDAY=WE;BYWEEKNO=14,16,18,20,22,24,26,28,30,32,34,36,
   38,40,42,44,46,48,50,52

but that's tedious to type, and folks probably don't care all that
much about ISO weeks.  I've gone with WEEKLY and INTERVAL=2 to give us
something that might survive the end of the year.

The ICS was validated with [16].

The CRLF line endings are intentional [17], and the .gitattributes
entry ensures we keep them.  The committed files will still have LF
endings, which can confuse 'git diff ...', but you can use
--ignore-space-at-eol to see what really changed.

[1]: https://groups.google.com/a/opencontainers.org/d/msg/dev/p0mTOspVgd0/mh7FYse2BAAJ
     Subject: Re: Moving the OCI Call (again)
     Date: Thu, 9 Mar 2017 08:37:55 -0700
     Message-ID: <CAJg1wMTCGEFRuKoKBEbUPdho82TVH8sPZdGORK_NA2vCNe+w9w@mail.gmail.com>
[2]: https://groups.google.com/a/opencontainers.org/d/msg/dev/p0mTOspVgd0/ULXnARy9BAAJ
     Subject: Re: Moving the OCI Call (again)
     Date: Thu, 9 Mar 2017 18:33:34 +0100
     Message-ID: <CAPWU_0rByhFp=jQQ6cvagHJuYmeTvN7T1zAW+oZR3=F1W8b_rw@mail.gmail.com>
[3]: https://github.com/opencontainers/runtime-spec/pull/719#pullrequestreview-26109314
[4]: http://doodle.com/poll/zu664785gb59pwkg
[5]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/date.html
[6]: http://ircbot.wl.linuxfoundation.org/meetings/opencontainers/2017/opencontainers.2017-03-22-21.00.log.html
[7]: https://tools.ietf.org/html/rfc5545#section-3.8.7.3
[8]: https://tools.ietf.org/html/rfc5545#section-3.8.7.2
[9]: https://tools.ietf.org/html/rfc5545#section-3.6.1
[10]: https://tools.ietf.org/html/rfc5545#page-69
[11]: https://tools.ietf.org/html/rfc2445#section-4.6.1
[12]: https://tools.ietf.org/html/rfc2445#section-4.8.5.4
[13]: https://tools.ietf.org/html/rfc5545#appendix-A.1
[14]: https://calendar.google.com/
[15]: http://mozilla-comm.github.io/ical.js/
[16]: https://icalendar.org/validator.html
[17]: https://tools.ietf.org/html/rfc5545#section-3.1

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-03-22 23:19:18 -07:00
zhouhao 3ca5c6c58e config-linux.md: fix seccomp
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
2017-03-20 13:32:30 +08:00
Qiang Huang e659613ba5 Merge pull request #738 from wking/broken-mounts-example
config: Fix broken JSON in Windows mount example
2017-03-19 20:39:25 -05:00
W. Trevor King fab8f37611 config: Fix broken JSON in Windows mount example
The 'key: value' syntax is for objects, but 'mounts' is an array.

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-03-16 15:48:15 -07:00
Tianon Gravi 4badf7fae7 Merge pull request #721 from Mashimiao/specs-config-format-code
specs-go/config.go: format code
2017-03-13 11:31:16 -07:00
Tianon Gravi 74a8f826d1 Merge pull request #722 from Mashimiao/file-spec-fix
spec.md: small fix
2017-03-13 11:30:31 -07:00
Tianon Gravi 7976d1f5e1 Merge pull request #723 from Mashimiao/config-fix-broken-links
config.md: fix broken links
2017-03-13 11:29:56 -07:00
Ma Shimiao ec2bb61aad config.md: fix broken links
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-03-13 17:47:08 +08:00
Ma Shimiao fbd6baf14c spec.md: small fix
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-03-13 16:18:51 +08:00
Ma Shimiao 627f5338cc specs-go/config.go: format code
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-03-13 13:43:53 +08:00
Vincent Batts 55e1a84c1f Merge pull request #720 from Mashimiao/config-linux-fix-namespace-path
config-linux.md: clearly require absolute path for namespace
2017-03-10 18:06:17 -05:00
Mrunal Patel 76159da8ca Merge pull request #630 from xiaochenshen/rdt-cat-resctrl-cgroup-v1
specs-go/config: add Intel RDT/CAT Linux support
2017-03-10 09:41:16 -08:00
Michael Crosby 6bfef10d91 Merge pull request #714 from q384566678/seccomp-commits
remove comment
2017-03-10 09:07:37 -08:00
Xiaochen Shen 73a6002bf3 specs-go/config: add Intel RDT/CAT Linux support
Add support for Intel Resource Director Technology (RDT) / Cache Allocation
Technology (CAT). Add L3 cache resource constraints in Linux-specific
configuration.

This is the prerequisite of this runc proposal:
https://github.com/opencontainers/runc/issues/433

For more information about Intel RDT/CAT, please refer to:
https://github.com/opencontainers/runc/issues/433

Signed-off-by: Xiaochen Shen <xiaochen.shen@intel.com>
2017-03-10 17:29:08 +08:00
Ma Shimiao 72cbff6786 config-linux.md: clearly require absolute path for namespace
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-03-10 12:00:16 +08:00
zhouhao 90427c9345 remove comment
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
2017-03-10 09:19:28 +08:00
Mrunal Patel 71afb411fe Merge pull request #712 from wking/seccomp-json-schema-names
schema/defs-linux: Fix type for seccomp names
2017-03-09 09:56:45 -08:00
Vincent Batts ce9db858d8 Merge pull request #718 from wking/v1.0.0-rc5-change-log
ChangeLog: Document changes since v1.0.0-rc4
2017-03-09 09:23:23 -05:00
Vincent Batts c4c73619c7 Merge pull request #710 from vbatts/bump-version
Bump version
2017-03-08 18:05:59 -05:00
Daniel, Dao Quang Minh dd41d8ffd6 Merge pull request #711 from wking/example-cap-json-typo
config: Remove trailing comma in CAP_KILL examples
2017-03-08 15:49:58 +00:00
Daniel, Dao Quang Minh 92f492493d Merge pull request #709 from wking/style-link-markup
style: Backtick `DOC_FILES`, `_N`, and `N`.
2017-03-08 15:49:03 +00:00
Qiang Huang f82df753f9 Merge pull request #708 from wking/backtick-cleanup
config-solaris: Fix "VNIC`s" -> "VNIC's" typo
2017-03-07 21:42:20 -06:00
Tianon Gravi 5f869f9b7e Merge pull request #717 from crosbymichael/remove-alex
Remove lk4d4 as maintainer
2017-03-07 14:00:09 -08:00
Michael Crosby dd494461ea Remove lk4d4 as maintainer
Closes #715

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-03-07 13:14:22 -08:00
W. Trevor King 5bf9b95c45 schema/defs-linux: Fix type for seccomp names
The:

  "type": [
    "string"
  ]

syntax added in 652323cd (improve seccomp format to be more
expressive, 2017-01-13, #657) is not valid:

  $ ./validate ./config-schema.json <../config.json
  The document is not valid. see errors :
  - linux.seccomp.syscalls.0.names: Invalid type. Expected: string, given: array

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-03-06 12:15:47 -08:00
W. Trevor King 379360d1c7 config: Remove trailing comma in CAP_KILL examples
Fix a JSON typo which snuck in with eb114f05 (Add ambient and bounding
capability support, 2017-02-02, #675).

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-03-06 12:12:41 -08:00
W. Trevor King 37391fb66f ChangeLog: Document changes since v1.0.0-rc4
Through d87ec69 (Merge pull request #687 from
jlbutler/link-cleanup-676, 2017-03-03).

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-03-06 11:33:09 -08:00
Vincent Batts 8713ba1087
version: put this branch back to -dev
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2017-03-06 13:05:00 -05:00
Vincent Batts 035da1dca3
version: release v1.0.0-rc5
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2017-03-06 13:04:28 -05:00
W. Trevor King c089e7c1ec style: Backtick `DOC_FILES`, `_N`, and `N`.
These are literal quotes, and we don't want Markdown to confuse the
underscores with emphasis delimiters [1].

[1]: http://daringfireball.net/projects/markdown/syntax#em

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-03-03 12:28:16 -08:00
W. Trevor King a4d7f0eff3 config-solaris: Fix "VNIC`s" -> "VNIC's" typo
Unwind an overly-aggressive backtick replacement from f9dc90b0 (make
link usage consistent across the specification, 2017-02-09, #687).

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-03-03 12:22:30 -08:00
Michael Crosby d87ec6945f Merge pull request #687 from jlbutler/link-cleanup-676
make link usage consistent across the specification
2017-03-03 11:50:37 -08:00
Jesse Butler f9dc90b05a make link usage consistent across the specification
Signed-off-by: Jesse Butler <jesse.butler@oracle.com>
2017-03-03 14:43:09 -05:00
Mrunal Patel f47e43c643 Merge pull request #705 from q384566678/test-seecomp
Add new architectures from libseccomp 2.3.2
2017-03-03 11:36:27 -08:00
Michael Crosby 7da699dcda Merge pull request #532 from wking/tk/restore-hook-lifecycle
Restore hook language removed by create/start split
2017-03-03 10:36:20 -08:00
W. Trevor King f636808bfd *: Restore hook lifecycle information removed by create/start split
I expect the lifecycle information was removed accidentally in
be594153 (Split create and start, 2016-04-01, #384), because for a
time it seemed like that PR would also be removing hooks.  Putting the
lifecycle information back in, I made some tweaks to adjust to the new
environment, for example:

* Put the pre-start hooks after the 'start' call, but before the meat
  of the start call (the container-process exec trigger).  Folks who
  want a post-create hook can add one with that name.  I'd like to
  have renamed poststop to post-delete to avoid confusion like [1].
  But the motivation for keeping hooks was backwards compatibility [2]
  so I've left the name alone.

* Put each "...command is invoked..." lifecycle entry in its own list
  entry, to match the 'create' list entry.

* Move the rules about what happens on hook failure into the
  lifecycle.  This matches pre-split entries like:

    If any prestart hook fails, then the container MUST be stopped and
    the lifecycle continues at step 7.

  and avoids respecifying that information in a second location
  (config.md).

* I added the warning section to try and follow post-split's generic
  "generates an error" approach while respecting the pre-split desire
  to see what failed (we had "then an error including the exit code
  and the stderr is returned to the caller" and "then an error is
  logged").

* I left the state 'id' context out, since Michael didn't want it [3].

* Make runtime.md references to "generate an error" and "log a
  warning" links, so readers have an easier time finding more detail
  on that wording.

Where I reference a section, I'm still using the auto-generated anchor
for that header and not the anchors which were added in 41839d7 (Merge
pull request #707 from mrunalp/anchor_tags, 2017-03-03) and similar.
Mrunal suggested that the manually-added anchors were mainly intended
for the validation tooling [4].

[1]: https://github.com/opencontainers/runtime-spec/pull/395
     Subject: Run post-stop hooks before the container sandbox is deleted.
[2]: https://github.com/opencontainers/runtime-spec/pull/483#issuecomment-240568422
     Subject: *: Remove hooks
[3]: https://github.com/opencontainers/runtime-spec/pull/532#discussion_r99232480
     Subject: Restore hook language removed by create/start split
[4]: http://ircbot.wl.linuxfoundation.org/eavesdrop/%23opencontainers/%23opencontainers.2017-03-03.log.html#t2017-03-03T18:02:12

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-03-03 10:04:23 -08:00