Commit Graph

903 Commits

Author SHA1 Message Date
Mrunal Patel 8c22b690a4 Merge pull request #688 from Mashimiao/schema-fix-device-required
schema: remove major,minor from device required items
2017-02-17 10:18:30 -08:00
Mrunal Patel 359de8f44d Merge pull request #691 from crosbymichael/abstract
Add OCI Runtime Abstract
2017-02-17 08:08:04 -08:00
Michael Crosby b81c09c9fd Add OCI Runtime Abstract
Closes #506

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-02-16 15:39:35 -08:00
Mrunal Patel e6d2a0ff2b Merge pull request #685 from Mashimiao/config-fix-and-hook-args
config.md: args of Hooks should be optional
2017-02-15 14:12:46 -08:00
Ma Shimiao 0e808fcad0 schema: remove major,minor from device required items
When type is p, major and minor is not required.
So, we should not leave them in require.

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-02-14 14:15:12 +08:00
Vincent Batts 21f7998bfb Merge pull request #570 from wking/go-protocol-definition
config: Link platform:"…" JSON tags with ~~protocol~~ platform slugs
2017-02-09 14:33:25 -06:00
Ma Shimiao fcd62099ff config.md: args of Hooks should be optional
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-02-09 09:45:42 +08:00
Vincent Batts 67c81aa3c6 Merge pull request #684 from Mashimiao/schema-fix-invalid-types
schema: fix invalid types
2017-02-08 15:24:26 -05:00
Mrunal Patel 1f408dc1db Merge pull request #507 from wking/add-creating-status
runtime: Add 'creating' to state status
2017-02-08 11:46:50 -08:00
Mrunal Patel 7c1a16b54a Merge pull request #552 from x1022as/validate
improve validate usage message
2017-02-08 11:45:29 -08:00
W. Trevor King 4af0c72f92 config: Link platform:"..." JSON tags with platform slugs
So that the semantics of the tags are clear.

The platform/protocol disconnect is unfortunate.  "Protocol" was
chosen in de3f1af6 (Remove language around Solaris being optional as
it is covered in compliance language, 2016-08-17, #527) because we may
have compliance subsets that aren't linked to platforms [1].  I'd be
open to renaming the JSON tag from platform:"..." -> protocol:"...",
but that's probably more change than it's worth.  The approach taken
in this commit, on the other hand, renames "protocol" to "platform".
I think that unnecessarily limits (or sets up confusing semantics for)
the platform/protocol values you can use, but two maintainers both
prefer "platform" [2,3].

[1]: https://github.com/opencontainers/runtime-spec/pull/527#issuecomment-238979250
[2]: https://github.com/opencontainers/runtime-spec/pull/570#discussion_r99227202
[3]: https://github.com/opencontainers/runtime-spec/pull/570#discussion_r100013014

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-02-08 08:01:47 -08:00
W. Trevor King b4a3c8daeb spec: Slug protocol names
We'll be referring to these in code, and using a slug everywhere
avoids having to define both a slug form (linux) and an English form
(Linux containers).

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-02-08 07:47:09 -08:00
Ma Shimiao 4100020dfc schema: fix invalid types
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-02-08 16:35:45 +08:00
Deng Guangxing 21ee162b42 add explicit usage message to validate and some fix
this commit contains:
* add explicit usage message to validate
* schemaPath was overrided by filepath.Abs(), schemaLoader would not get
* the abs path.
* check local scheme and document file path with os.Stat()

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2017-02-08 15:18:18 +08:00
Michael Crosby 2e2d568b83 Merge pull request #673 from jlbutler/config-compat-303
narrative cleanup in support of Base Config Compatibility #303
2017-02-07 14:19:21 -08:00
Jesse Butler 718f9f3f5d minor narrative cleanup regarding config compatibility
Signed-off-by: Jesse Butler <jesse.butler@oracle.com>
2017-02-07 12:57:06 -05:00
Vincent Batts 0d104bb63c Merge pull request #672 from vbatts/bump-version
Bump version for 1.0.0-rc4
2017-02-06 12:30:34 -05:00
Qiang Huang 2392e66f16 Merge pull request #674 from crosbymichael/state
Rename bundlePath to bundle
2017-02-06 10:43:17 +08:00
Qiang Huang ce0783aa1c Merge pull request #662 from wking/json-schema-no-pointer
schema: Drop pointers and nulls
2017-02-06 10:41:35 +08:00
Mrunal Patel 7278567eb2 Merge pull request #666 from dqminh/container-filesystem
linux: relax filesystem requirements for container
2017-02-03 11:22:16 -08:00
Michael Crosby 5d3f1674e6 Rename bundlePath to bundle
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-02-02 13:10:54 -08:00
Vincent Batts 2a234c749b
version: master back to -dev
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2017-01-30 08:10:59 -05:00
Vincent Batts 339eba5240
version: release 1.0.0-rc4
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2017-01-30 08:10:51 -05:00
W. Trevor King be402e40ed ChangeLog: Document changes since v1.0.0-rc3
Through 3297cd57 (Merge pull request #216 from
wking/travis-test-branch-commits, 2017-01-24).

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-01-27 13:03:03 -08:00
Michael Crosby 3297cd573e Merge pull request #216 from wking/travis-test-branch-commits
.travis: Convert TRAVIS_COMMIT_RANGE base...head to base..head
2017-01-24 10:04:50 -08:00
W. Trevor King 550a73abb5 .travis.yml: Print TRAVIS_* environment variables
To make make debugging Travis environment issues more straightforward.

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-01-23 15:59:30 -08:00
W. Trevor King dd40abea2e Makefile: Use 'ifdef TRAVIS_COMMIT_RANGE' for git-validation
Only use the auto-ranging when Travis tells us what the range is.  Use
our EPOCH_TEST_COMMIT-based range in all other cases.

ifdef is described in [1].

[1]: https://www.gnu.org/software/make/manual/html_node/Conditional-Syntax.html

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-01-23 15:59:05 -08:00
W. Trevor King 092743727e schema: Drop pointers and nulls
Maintainers feel (and I agree) that there's no point in explicitly
allowing a null value when callers can simply leave the property unset
[1].  This commit removes all references to "pointer" and "null" from
the JSON Schema to support that decision.  While optional properties
may sometimes be represented as pointer types in Go [2], optional
properties should be represented in JSON Schema by not including the
properties in the 'required' array.

[1]: https://github.com/opencontainers/runtime-spec/pull/555#issuecomment-272020515
[2]: style.md "Optional settings should not have pointer Go types"

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-01-23 11:23:44 -08:00
Michael Crosby 8df60240c3 Merge pull request #664 from wking/state-required-optional
runtime: Only require 'pid' in the state for created/running statuses
2017-01-23 10:34:26 -08:00
Michael Crosby d5a1269c87 Merge pull request #545 from Mashimiao/fix-blockio-related-validation
fix blkio related validation
2017-01-23 10:32:27 -08:00
Michael Crosby dd5e44a6b4 Merge pull request #665 from Mashimiao/schema-fix-string-ref
schema: fix invalid string reference
2017-01-23 10:31:18 -08:00
Daniel Dao 279c3c095c
linux: relax filesystem requirements for container
change MUST to SHOULD so containers are not required to have all these
filesystems mounted.

Signed-off-by: Daniel Dao <dqminh89@gmail.com>
2017-01-23 12:44:36 +00:00
Ma Shimiao 1b3e2c7f26 schema: fix invalid string reference
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-01-23 11:49:22 +08:00
W. Trevor King 65d9d6b885 runtime: Add 'creating' to state status
To distinguish between "we're still setting this container up" and
"we're finished setting up; you can call 'start' if you like".

Also reference the lifecycle steps, because you can't be too explicit

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-01-22 16:46:29 -08:00
Qiang Huang 579548a46e Merge pull request #465 from wking/stop-to-exit
runtime: Replace "process is stopped" with "process exits"
2017-01-22 00:29:10 -06:00
W. Trevor King 70ee91c6e3 runtime: Only require 'pid' in the state for created/running statuses
Because during creation (before 'created') we may not have a container
process yet (e.g. if we're still reading the configuration or setting
up cgroups), and in the 'stopped' phase the PID is no longer
meaningful.

Also add OPTIONAL/REQUIRED and remove colons for consistency with the
config.md.

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-01-21 20:36:59 -08:00
Qiang Huang a05975645a Merge pull request #660 from opencontainers/RobDolinMS-577-replace-v2
[Config Linux] Clarify: App --> Container
2017-01-21 20:41:40 -06:00
W. Trevor King d9b7bc39b4 .travis: Convert TRAVIS_COMMIT_RANGE base...head to base..head
Work around travis-ci/travis-ci#4596 until that is fixed upstream [1].
This avoids pulling in commits from the base tip that aren't reachable
from the head tip (e.g. if master has advanced since the PR branched
off, and the PR is against master).  We only want to check commits
that are in the head branch but not in the base branch (more details
on the range syntax in [2]).

Once the Travis bug does get fixed, the shell replacement will be a
no-op.  So we don't have to worry about checks breaking once the bug
gets fixed, and can periodically poll the bug and remove the
workaround at out leisure after the fix.

[1]: https://github.com/travis-ci/travis-ci/issues/4596
[2]: http://git-scm.com/docs/gitrevisions#_specifying_ranges

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-01-18 20:48:54 -08:00
Mrunal Patel c368be6a74 Merge pull request #650 from wking/readme-header-nesting
README: Consistent header nesting
2017-01-18 14:32:21 -08:00
Vincent Batts dc0fa75942 Merge pull request #655 from Mashimiao/schema-fix-with-latest-spec
schema: fix items based on latest spec
2017-01-18 17:29:21 -05:00
Mrunal Patel 937ea7bc5c Merge pull request #490 from wking/json-schema-validate-http-schema
schema/validate: Allow schema identifiers to contain a URL scheme
2017-01-18 14:13:33 -08:00
Rob Dolin (MSFT) 646826658d [Config Linux] Clarify: App --> Container
Replaces #577

Signed-off-by: Rob Dolin (MSFT) <robdolin@microsoft.com>
2017-01-18 10:29:13 -08:00
Mrunal Patel b10c0b2c22 Merge pull request #654 from wking/unique-within-this-map
config: Bring "unique... within this map" back together
2017-01-18 09:51:53 -08:00
Mrunal Patel b12752e3ab Merge pull request #656 from wking/string-pointer-fixups
schema: Remove string pointers
2017-01-18 09:50:51 -08:00
W. Trevor King 9cc61372e8 config: Split annotations restrictions into one-per-sentence
As recommended by Daniel [1], although I've adjusted his recommended
wording slightly and split the requirements into paragraphs.

[1]: https://github.com/opencontainers/runtime-spec/pull/654#discussion_r95981169

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-01-13 07:31:13 -08:00
W. Trevor King 83200898a1 schema: Remove string pointers
Catch up with 868e6310 (Remove string pointers, 2017-01-12, #653).

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-01-13 07:09:36 -08:00
Qiang Huang 5398f4e217 Merge pull request #653 from mrunalp/remove_str_ptrs
Remove string pointers
2017-01-13 02:03:08 -06:00
Ma Shimiao 5076439d49 schema: fix items based on latest spec
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-01-13 13:59:16 +08:00
W. Trevor King f298e10fd4 style: Reverse pro-pointer preference to be anti-pointer
The maintainer position on this has shifted, with the sea change
coming around [1].

[1]: http://ircbot.wl.linuxfoundation.org/meetings/opencontainers/2017/opencontainers.2017-01-11-22.04.log.html#l-108

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-01-12 15:25:11 -08:00
W. Trevor King 9a6aca2562 style: Update GitHub references
They've changed their anchor pattern for inline comments.

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-01-12 15:19:34 -08:00