Commit Graph

707 Commits

Author SHA1 Message Date
Aleksa Sarai 9ffd72407b
config-linux: cleanup cgroup wording
Some of the wording was a bit clumsy (and incorrect, by conflating
different concepts in control groups as "cgroups").

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-07-22 01:30:36 +10:00
Michael Crosby bb6925ea99 Merge pull request #519 from wking/config-schema-json-link
config: Update schema.json -> config-schema.json
2016-07-20 08:00:47 -07:00
W. Trevor King 7f182857b4 config: Update schema.json -> config-schema.json
This slipped through the rename in 2a5986f7 (schema/state-schema.json:
Add a JSON Schema for the state JSON, 2016-06-01, #481) and the first
round of fixes in dfb85b16 (schema/README: Fix links to
(config|state)-schema.json, 2016-06-13, #498).  Reported by hapnermw
[1].

[1]: https://github.com/opencontainers/runtime-spec/issues/517

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-07-18 20:37:23 -07:00
Vincent Batts bbaf29e617 Merge pull request #515 from wking/new-conference-call-number
README: Update conference-call phone number
2016-07-15 19:16:17 +09:00
W. Trevor King 41ff2df25f README: Update conference-call phone number
On Thu, Jul 14, 2016 at 06:27:50PM -0700, Chris Aniszczyk wrote [1]:
> There was a change in the phone number for the conference line, URL
> is the same.
>
> Join the call: https://www.uberconference.com/opencontainers
> Optional dial in number: 415-968-0849
> No PIN needed

[1]: https://github.com/opencontainers/runtime-spec/issues/514

Reported-by: Chris Aniszczyk <caniszczyk@gmail.com>
Signed-off-by: W. Trevor King <wking@tremily.us>
2016-07-14 20:02:59 -07:00
Vincent Batts 2fc88759b8 Merge pull request #512 from duglin/phone
Add a working call-in number
2016-07-06 09:52:43 -07:00
Doug Davis 8d8b26d305 Add a working call-in number
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-07-06 07:09:22 -07:00
Michael Crosby b45aa77484 Merge pull request #502 from wking/optional-linux-solaris
specs-go/config: Make Linux and Solaris omitempty (again)
2016-06-24 15:39:51 -07:00
Mrunal Patel 0473c7e6f1 Merge pull request #505 from estesp/seccomp-arches
Add new architectures from libseccomp 2.3.0
2016-06-23 07:40:01 -07:00
Phil Estes 124ce0beeb Add new architectures from libseccomp 2.3.0
Signed-off-by: Phil Estes <estesp@gmail.com>
2016-06-22 17:43:50 -04:00
Mrunal Patel 8399dc9f95 Merge pull request #503 from jhowardmsft/jjh/typo
Typo in apparmorprofile comment
2016-06-21 15:39:30 -07:00
Mrunal Patel 1c48651212 Merge pull request #498 from leecalcote/patch-1
schema/README: Fix links to (config|state)-schema.json
2016-06-21 15:38:48 -07:00
John Howard c601539f01 Typo in apparmorprofile comment
Signed-off-by: John Howard <John.Howard@microsoft.com>
2016-06-21 13:53:58 -07:00
W. Trevor King 63231576ec specs-go/config: Make Linux and Solaris omitempty (again)
I'd added some omitempties in 5c2193f3 (specs-go/config: Make Linux
and Solaris omitempty, 2016-05-06, #431), but it turns out to not have
the intended effect unless the field is also a pointer type (even
after I shifted the 'omitempty' from the platform tag to the json
tag).  Before this commit:

  $ ./ocitools generate --template <(echo '{}')
  $ jq . config.json
  {
    "ociVersion": "1.0.0-rc1-dev",
    "platform": {
      "os": "linux",
      "arch": "amd64"
    },
    "process": {
      "user": {
        "uid": 0,
        "gid": 0
      },
      "args": [],
      "cwd": "/"
    },
    "root": {
      "path": "rootfs"
    },
    "hooks": {},
    "linux": {
      "cgroupsPath": ""
    },
    "solaris": {
      "cappedCPU": {},
      "cappedMemory": {}
    }
  }

And after this commit:

  $ ./ocitools generate --template <(echo '{}')
  $ jq . config.json
  {
    "ociVersion": "1.0.0-rc1-dev",
    "platform": {
      "os": "linux",
      "arch": "amd64"
    },
    "process": {
      "user": {
        "uid": 0,
        "gid": 0
      },
      "args": [],
      "cwd": "/"
    },
    "root": {
      "path": "rootfs"
    },
    "hooks": {},
  }

The remaining useless properties are addressed by other in-flight pull
requests:

* 5ca74df (config: Make 'process.args' optional, 2016-06-04, #489)
* ad33f9c (config: Explicitly list 'hooks' as optional, 2016-05-06,
  #427)

So I've left them alone here.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-17 22:14:48 -07:00
Lee Calcote dfb85b165a schema/README: Fix links to (config|state)-schema.json
Fix regression respectively introduced in 59ede1a and 59ede1a

The config-schema.json and state-schema.json references were missing "-schema".

Signed-off-by: Lee Calcote <leecalcote@gmail.com>
2016-06-17 12:45:08 -05:00
Mrunal Patel c8fac669b9 Merge pull request #487 from wking/no-distribution-references
bundle: Remove distribution references
2016-06-15 09:55:31 -07:00
Michael Crosby 6de52a7d39 Merge pull request #495 from grahamwhaley/fix-bullet-indent
runtime.md: Fix sub-bullet indentation
2016-06-10 10:41:13 -07:00
Brandon Philips 83ec31b193 Merge pull request #496 from anuthan/specs_go
Correction to User struct in specs-go/config.json
2016-06-09 19:34:21 -07:00
Abhijeeth Nuthan 2c41403b86 Correction to User struct in specs-go/config.json
Signed-off-by: Abhijeeth Nuthan <abhijeeth.nuthan@oracle.com>
2016-06-09 11:42:30 -07:00
Daniel, Dao Quang Minh 2f0fa18f12 Merge pull request #481 from wking/state-schema
schema/state.json: Add a JSON Schema for the state JSON
2016-06-09 13:01:05 +01:00
W. Trevor King 2a5986f7d6 schema/state-schema.json: Add a JSON Schema for the state JSON
The IDs namespace the fields within the OCI, with /runtime to select
the opencontainers/runtime-spec project, and /state to select the
state JSON within runtime-spec.

Signed-off-by: W. Trevor King <wking@tremily.us>
2016-06-08 20:43:06 -07:00
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