Commit Graph

786 Commits

Author SHA1 Message Date
W. Trevor King a3126aa342 schema/defs.json: Pull annotations over from config-schema.json
So we can use it in the coming state-schema.json without duplication.
I dropped the "id" because none of the other defs.json entries had an
ID.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-08 20:43:06 -07:00
W. Trevor King 28cbd4dd8e schema/defs.json: Pull ociVersion over from config-schema.json
So we can use it in the coming state-schema.json without duplication.
While I'm touching it, I updated the spec title to match the project
README's header.  I also dropped the "id" because none of the other
defs.json entries had an ID.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-08 20:43:06 -07:00
W. Trevor King 59ede1a6ac schema: Move schema.json -> config-schema.json and similar
To make it clear that these schemas are for validating config.json
(and not, for example, state JSON).  I've left the IDs alone for now,
because my PR adjusting those was rejected [1].

The rule for the -schema portion is "use it for entrypoint files" [2].

[1]: https://github.com/opencontainers/runtime-spec/pull/453
[2]: https://github.com/opencontainers/runtime-spec/pull/481#issuecomment-223641814

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-08 20:43:06 -07:00
Graham Whaley 7795661d84 runtime.md: Fix sub-bullet indentation
The indentation of the sub bullets for the status entries under State were not
indented by the 4 spaces required by markdown. They did not render well in
the pdf, at least with my native build with pandoc v1.13.2. Change them to 4
spaces, which now renders well.

Signed-off-by: Graham Whaley <graham.whaley@linux.intel.com>
2016-06-08 19:05:08 +01:00
Michael Crosby 79b26a19e2 Merge pull request #491 from wking/schema-hostname-optional
schema/schema.json: Make 'hostname' optional
2016-06-06 11:05:17 -07:00
Michael Crosby e1be8d8997 Merge pull request #488 from wking/drop-v0.x-compatibility-statement
Revert "Clarify backwards compatibility for major version 0"
2016-06-06 10:18:47 -07:00
W. Trevor King b10f8bcc49 schema/schema.json: Make 'hostname' optional
The JSON Schema requirement dates back to cdcabdeb (schema: JSON
Schema and validator for `config.json`, 2016-01-19, #313), but the
property has been explicitly optional in the Markdown spec since
7ac41c69 (config.md: reformat into a standard style, 2015-06-30).

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-06 00:03:41 -07:00
W. Trevor King 1db5c54821 Revert "Clarify backwards compatibility for major version 0"
This reverts commit 0f25f18b9b, #253.
Now that we're on to 1.0, we don't need to talk about 0.x.  And the
lack of 0.x backwards compatability is covered by SemVer 2.0 section 4
[1]:

  Major version zero (0.y.z) is for initial development.  Anything may
  change at any time.  The public API should not be considered stable.

so removing the echo from our spec doesn't actually change anything.

The conflict is due to 4e63ee0a (config: qualify the name of the
version field, 2016-01-13, #309), and only impacted the context and
line-wrapping around the sentence I'm removing.

Conflicts:
	config.md

[1]: http://semver.org/spec/v2.0.0.html

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-04 16:25:59 -07:00
W. Trevor King ecb7fa51ea bundle: Remove distribution references
These distribution requirements belong in image-spec or similar.  They
don't apply to runtimes or filesystem bundles (the latter are covered
by the earlier "This MUST include the following artifacts"), which are
the two entities tested for compliance with this spec.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-04 13:51:07 -07:00
Mrunal Patel b953df4281 Merge pull request #486 from vbatts/bump-v1.0rc1
Bump v1.0rc1
2016-06-03 13:43:02 -07:00
Vincent Batts 7d4fe7380f version: bump to -dev for master
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2016-06-03 15:47:55 -04:00
Vincent Batts 06479209bd version: v1.0.0-rc1
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2016-06-03 15:47:55 -04:00
W. Trevor King 2bbd7f4a59 ChangeLog: Document changes since v0.5.0
Through 303c03a (Merge pull request #412 from
wking/explicit-uid-namespace, 2016-06-03).

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-03 15:47:50 -04:00
Michael Crosby 303c03a23d Merge pull request #412 from wking/explicit-uid-namespace
config: Explicit container namespace for uid, gid, and additionalGids
2016-06-03 11:14:09 -07:00
Michael Crosby 08c556ff87 Merge pull request #482 from wking/validate-stdin
schema/validate: Support reading documents via stdin
2016-06-03 10:45:31 -07:00
Vincent Batts 831d961964 Merge pull request #397 from cyphar/add-cgroup-namespace
*: add support for cgroup namespace
2016-06-03 13:45:27 -04:00
Vincent Batts eeeecb0f44 Merge pull request #485 from duglin/FixStatus
Add 'status' to state.go
2016-06-03 13:44:40 -04:00
Mrunal Patel 34901c10b3 Merge pull request #484 from duglin/ShowAnnot
Add annotations to the state json
2016-06-03 10:43:59 -07:00
Aleksa Sarai d514aad1bc runtime: lifecycle: environment must match config.json
Make it clear that if a runtime cannot set up an environment that
*precisely* matches the config.json provided, it must generate an error.
This is important because not doing this can cause security issues.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-06-04 00:14:39 +10:00
Aleksa Sarai ce19b8d167 *: add support for cgroup namespace
The cgroup namespace is a new kernel feature available in 4.6+ that
allows a container to isolate its cgroup hierarchy. This currently only
allows for hiding information from /proc/self/cgroup, and mounting
cgroupfs as an unprivileged user. In the future, this namespace may
allow for subtree management by a container.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-06-04 00:14:39 +10:00
Qiang Huang fddb3e5527 Merge pull request #468 from wking/start-does-not-confirm-success
runtime: Remove start's "fails to run" monitoring
2016-06-03 10:20:05 +08:00
Doug Davis 9cb0c7fa6c Add annotations to the state json
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-06-02 13:31:09 -07:00
Doug Davis a93873a099 Add 'status' to state.go
Forgot to do this in previous PR.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-06-02 13:28:59 -07:00
Mrunal Patel 91c8ddc306 Merge pull request #479 from vbatts/CI_for_docs
travis: regress on failure to produce docs
2016-06-02 08:36:56 -07:00
Qiang Huang a5ab330c54 Merge pull request #478 from vbatts/docs_output
Makefile: filename docs.* -> oci-runtime-spec.*
2016-06-02 14:30:44 +08:00
W. Trevor King 08908d6f2e config: Explicit container namespace for uid, gid, and additionalGids
In the degenerate case where the container does not create a user
namespace, the "container namespace" distinction is unimportant, but
the phrasing is still accurate (the container and runtime namespaces
are the same).

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-01 20:58:02 -07:00
W. Trevor King 8ca7174c10 schema/validate: Support reading documents via stdin
Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-01 16:11:36 -07:00
Mrunal Patel f0e14cd4b1 Merge pull request #475 from michael-holzheu/seccomp_add_ppc_and_s390x
seccomp: Add ppc and s390x to specs-go/config.go
2016-06-01 13:14:41 -07:00
Michael Crosby 1b7a1a9f64 Merge pull request #461 from wking/main-schema-description
schema/schema.json: Update main description
2016-06-01 11:54:45 -07:00
Vincent Batts a118c18db3 travis: regress on failure to produce docs
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2016-06-01 13:30:32 -04:00
Vincent Batts f656de6a56 Makefile: filename docs.* -> oci-runtime-spec.*
When this repo was only 'specs', then the generic name was not so bad.
But now there is also the oci-image-spec, so this lines up it's unique
name as well.

This also variablizes the output filename so it will be easier for
release specific names.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2016-06-01 13:26:54 -04:00
Michael Crosby 3b166cd0c2 Merge pull request #449 from hqhq/hq_enrich_runtime_linux
Add dev symbolic links in runtime_linux.md
2016-06-01 10:10:31 -07:00
Vincent Batts d8f8583781 Merge pull request #474 from hqhq/disallow_self_lgtm
Disallow self-LGTMs
2016-06-01 12:14:46 -04:00
Michael Holzheu bb287dd5d7 seccomp: Add ppc and s390x to specs-go/config.go
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-06-01 11:52:31 -04:00
Qiang Huang f61bec6e0c Disallow self-LGTMs
As https://github.com/opencontainers/project-template/pull/13
is merged, change pullapprove accordingly.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-06-01 09:34:10 +08:00
Mrunal Patel 8f02d00ede Merge pull request #462 from duglin/AddStatus
Add a 'status' field to our state struct
2016-05-31 10:48:12 -07:00
Doug Davis dd0cd2102b Add a 'status' field to our state struct
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-05-31 10:42:05 -07:00
Michael Crosby 991d26c2d4 Merge pull request #464 from wking/lifecycle-indent
runtime: Consistent indent for "However, some actions..."
2016-05-31 10:40:02 -07:00
W. Trevor King 7b28a16f7a runtime: Consistent indent for "However, some actions..."
The shorter-than-normal (for the rest of this list) indent landed with
the line in be594153 (Split create and start, 2016-04-01, #384).

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-31 10:25:48 -07:00
Mrunal Patel 44f22774ce Merge pull request #467 from wking/lifecycle-list-markup
runtime: Restore leading blank line before lifecycle list
2016-05-31 09:36:36 -07:00
W. Trevor King 78d37e9ddf runtime: Restore leading blank line before lifecycle list
Restore the line removed by be594153 (Split create and start,
2016-04-01, #384).  Without this, GitHub renders the list as a single
paragraph.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-28 13:06:21 -07:00
Qiang Huang 0dde4f9f4b Merge pull request #463 from wking/no-create-api-caveat
runtime: Drop create-specific API caveat from lifecycle
2016-05-28 09:31:56 +08:00
W. Trevor King 9b47c1241c runtime: Remove start's "fails to run" monitoring
The in-flight runC implementation just fires a signal at the container
[1,2].  It doesn't wait around to see if the signal has an effect, or if
it causes the container to crash, etc., etc.

[1]: 28126f8039/start.go (L29-L30)
[2]: 28126f8039/libcontainer/container_linux.go (L253-L258)

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-26 23:13:25 -07:00
W. Trevor King 05a548f135 runtime: Drop create-specific API caveat from lifecycle
This wording is descended from 7117ede7 (Expand on the definition of
our ops, 2015-10-13, #225), but the idea is covered generically by
e53a72b (Clarify the operation is not for command-line api,
2016-05-24, #450), so we no longer need a create-specific note.
Especially in the lifecycle docs, where there's already enough going
on without this low-level detail.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-26 22:37:50 -07:00
Mrunal Patel c26f07c877 Merge pull request #384 from duglin/SplitCreate
Split create and start
2016-05-26 16:56:44 -07:00
Doug Davis be594153b5 Split create and start
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-05-26 16:52:18 -07:00
W. Trevor King c4160b4a9e schema/schema.json: Update main description
The README title is:

    Open Container Runtime Specification

And the config.md title is:

    Container Configuration file

The JSON Schema covering that configuration file should have a
description that combines those two titles without introducing new
language.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-05-26 16:35:32 -07:00
Mrunal Patel 4a1a84096c Merge pull request #458 from crosbymichael/2lgtm
Add PullApprove checks
2016-05-26 15:54:18 -07:00
Chris Aniszczyk aa9f3a2661 Add PullApprove checks
Add PullApprove: https://pullapprove.com/opencontainers/runtime-spec/

Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-26 15:21:39 -07:00
Mrunal Patel 8bca380476 Merge pull request #456 from wking/json-schema-root-path-description
schema/schema.json: Update path.root description
2016-05-26 08:06:45 -07:00