Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move rlimits to process #341

Merged
merged 2 commits into from
Mar 10, 2016
Merged

Move rlimits to process #341

merged 2 commits into from
Mar 10, 2016

Conversation

julz
Copy link
Contributor

@julz julz commented Mar 10, 2016

As discussed at the 9/3/16 weekly call and on IRC, this moves the rlimits struct on to process to match capabilities, apparmor, selinux etc which were moved in 5a8a779.

Also fixed a typo (systemd -> systems)

Signed-off-by: Julian Friedman <julz.friedman@uk.ibm.com>
Signed-off-by: Julian Friedman <julz.friedman@uk.ibm.com>

* **`capabilities`** (array of strings, optional) capabilities is an array that specifies Linux capabilities that can be provided to the process inside the container.
Valid values are the strings for capabilities defined in [the man page](http://man7.org/linux/man-pages/man7/capabilities.7.html)
* **`rlimits`** (array of rlimits, optional) rlimits is an array of rlimits that allows setting resource limits for a process inside the container.
The kernel enforces the `soft` limit for a resource while the `hard` limit acts as a ceiling for that value that could be set by an unprivileged process.
Valid values for the 'type' field are the resources defined in [the man page](http://man7.org/linux/man-pages/man2/setrlimit.2.html).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backticks around type? And we may want to stick with the type style for all of these keys (including soft and hard).

@crosbymichael
Copy link
Member

LGTM

@crosbymichael crosbymichael added this to the v0.4.0 milestone Mar 10, 2016
@mrunalp
Copy link
Contributor

mrunalp commented Mar 10, 2016

LGTM

mrunalp pushed a commit that referenced this pull request Mar 10, 2016
@mrunalp mrunalp merged commit 0bcb711 into opencontainers:master Mar 10, 2016
@crosbymichael
Copy link
Member

We can update the formatting post merge

@wking
Copy link
Contributor

wking commented Mar 10, 2016

Through 9d9ed06 looks good to me, with a minor backtick nit 1.

I think summarizing the discussion for the PR or commit message would
be useful for folks who wonder about this later on, and am happy to
take a stab at writing that summary if folks want.

vbatts pushed a commit to vbatts/oci-runtime-spec that referenced this pull request Mar 10, 2016
Through 0bcb711 (Merge pull request opencontainers#341 2016-03-10).

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
wking referenced this pull request Apr 4, 2016
Also renamed "stop" to "delete" this way if we split it into stop & delete
later on then delete is still pretty much the same.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Mashimiao pushed a commit to Mashimiao/specs that referenced this pull request Aug 19, 2016
Through 0bcb711 (Merge pull request opencontainers#341 2016-03-10).

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants