Commit Graph

36 Commits

Author SHA1 Message Date
Vish Kannan 56b88759a6 Merge pull request #235 from yangdongsheng/kmem_tcp
cgroup: Add support for memory.kmem.tcp.limit_in_bytes
2015-12-14 21:39:53 -08:00
Vincent Batts 58f6cab5ff Merge pull request #251 from hqhq/hq_change_cgroupsPath
Change the behavior when cgroupsPath is absent
2015-12-08 13:46:53 -05:00
Qiang Huang d663a5b022 Change the behavior when cgroupsPath is absent
The former definition was join "/" when `cgroupsPath` is absent, it's
not clear whether to join the root cgroup or create a sub cgroup under "/".

Join root cgroup would be a bad idea cause that's not what a container
should do. And craete a sub cgroup would be missing definition about what
the cgroup name should that be.

So I think we should leave this to implementations what the default
cgroup path should be.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-11-19 08:52:49 +08:00
Lai Jiangshan a4d23949f6 runtime-config-linux.md: fix the type of cpus and mems
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2015-11-17 22:01:30 +08:00
Vincent Batts ab4acc05ff Merge pull request #199 from runcom/rework-runtime-config-linux
runtime: config: linux: add cgroups informations
2015-10-27 10:50:32 -04:00
Dongsheng Yang e9a6d94848 cgroup: Add support for memory.kmem.tcp.limit_in_bytes
Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
2015-10-26 15:25:54 -04:00
Vishnu kannan 3829131e91
Add oom_score_adj to the runtime Spec.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2015-10-12 12:40:22 -07:00
Antonio Murdaca 2ce2c866ff runtime: config: linux: add cgroups information
- add information to cgroup resources controllers with examples
- add pids cgroup information and example
- reflect kernel types

Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-10-02 23:36:46 +02:00
Lai Jiangshan 26d39ae967 convert **name** to **`name`**
we have both styles in the *.md, we should use only one of the styles.
**`name`** is much prettier than **name** in the result,
so we use **`name`**

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2015-09-29 22:19:26 +08:00
Michael Crosby 03bf64fd3f Merge pull request #176 from vbatts/docs-overhaul
Docs overhaul
2015-09-25 10:11:01 -07:00
Vincent Batts 70372d3880 *.md: update TOC and links
Some of the docs were not even linked to, and did not have a logic
outline for their grouping.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2015-09-25 11:47:16 -04:00
Matthew Heon 215d0d98c7 Add Seccomp constants to description of Linux runtime spec
Signed-off-by: Matthew Heon <mheon@redhat.com>
2015-09-23 15:16:49 -04:00
Matthew Heon 508743563d Add Architecture field to Seccomp configuration in Linux runtime
By default, Seccomp filters will only permit syscalls to be made using the
native architecture of the kernel. This is fine for most use cases, but breaks
others (such as running 32-bit code in a container on a host with a 64-bit
kernel). This patch adds a field to specify additional architectures which may
make syscalls.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2015-09-23 14:27:23 -04:00
Mrunal Patel 5e633ba00b Merge pull request #197 from gao-feng/rlimits
move the description of Rlimits before example
2015-09-17 15:12:18 -07:00
Mrunal Patel 3720db3c04 Merge pull request #193 from runcom/blkio-fixes
runtime: config: linux: Edit BlockIO struct
2015-09-17 15:10:59 -07:00
Antonio Murdaca e9d3ac025d runtime: config: linux: Edit BlockIO struct
`WeightDevice`, `ThrottleReadBpsDevice`, `ThrottleWriteBpsDevice`,
`ThrottleReadIOpsDevice`, `ThrottleWriteIOpsDevice` are now slices to
well defined structs to allow setting multiple devices in their respective
blkio file. By using a string to represents those values it wasn't possible
to set correct values when multiple devices were passed in the config
(either newline separated or comma separated).

Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-17 20:56:45 +02:00
Antonio Murdaca 75cb11ce4a runtime: config: linux: Fix typo and trailing commas in json example
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-17 12:27:08 +02:00
Gao feng e7746b12af move the description of Rlimits before example
Signed-off-by: Gao feng <omarapazanadi@gmail.com>
2015-09-17 17:03:07 +08:00
Michael Crosby cbda521647 Merge pull request #158 from mrunalp/ns_path
Clarify behavior around namespaces paths
2015-09-10 14:25:23 -07:00
Vishnu Kannan 429f936ff9 Adding cgroups path to the Spec.
Signed-off-by: Vishnu Kannan <vishnuk@google.com>
2015-09-10 11:22:29 -07:00
Vincent Batts 3f62423765 Merge remote-tracking branch 'origin/pr/159' 2015-09-10 10:10:18 -04:00
Mrunal Patel 02b456e91d Clarify behavior around namespaces paths.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-09-09 18:26:03 -04:00
Mrunal Patel d3a6069dc0 Change the rlimit type to string instead of int
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-09-09 12:46:23 -04:00
Lai Jiangshan 339e038400 Deduplicate the field of RootfsPropagation
There are two RootfsPropagation fields, one is Linux.RootfsPropagation,
the other one is LinuxRuntime.RootfsPropagation. They are duplicated,
one of them should be removed.

The RootfsPropagation is definitely a runtime specific configuration,
so we remove the one of Linux.RootfsPropagation.

And the description of it is moved from config-linux.md to
runtime-config-linux.md.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2015-09-09 23:27:37 +08:00
Vincent Batts 6cab2747d9 *.md: markdown formatting
Closes https://github.com/opencontainers/specs/issues/83

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2015-09-09 10:17:06 -04:00
Julian Friedman 3fd2530794 Make namespaces match runc
"mount" rather than "mnt", "network" rather than "net"

Signed-off-by: Julian Friedman <julz.friedman@uk.ibm.com>
2015-09-04 19:12:38 +01:00
Alexander Morozov 527a3eec38 Merge pull request #64 from cyphar/add-pids-cgroup
spec: linux: add support for the PIDs cgroup
2015-09-03 21:09:55 -07:00
Aleksa Sarai 834fb5db52 spec: linux: add support for the PIDs cgroup
Add support for the PIDs cgroup as a cgroup resource constraint in the
Linux container specification. Since PIDs are a real resource, we need
to support the ability to limit them.

The PIDs cgroup subsystem is available in Linux 4.3+.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
2015-09-03 17:32:35 +10:00
Lai Jiangshan 004ec5525a Rename the header "Access to devices" to "Devices" to fit with the config
And also fix the header size

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2015-09-03 07:12:23 +08:00
W. Trevor King 284f914909 runtime-config: Remove blank lines from the end of files
These snuck in with 7232e4b1 (specs: introduce the concept of a
runtime.json, 2015-07-30, #88) and 73bf1ba8 (JSON objects are easier
to parse/manipulate, 2015-08-27, #120).

Signed-off-by: W. Trevor King <wking@tremily.us>
2015-08-28 22:07:58 -07:00
Brandon Philips 6278334b91 Merge pull request #119 from wking/trailing-whitespace
Remove trailing whitespace
2015-08-27 13:48:56 -07:00
W. Trevor King 9f758db92f runtime-config-linux: One sentence per line for opening two paragraphs
I touched these paragraphs while removing trailing whitespace in the
previous commit.  Since I was touching them in this branch, it seemed
better to rewrap them using the "Markdown style" suggestions in the
README.

I also added a missing period after the namespaces(7) link.

Signed-off-by: W. Trevor King <wking@tremily.us>
2015-08-26 15:17:46 -07:00
W. Trevor King a48397b9eb Remove trailing whitespace
With:

  $ sed -i 's/  *$//' *.md *.go

Signed-off-by: W. Trevor King <wking@tremily.us>
2015-08-26 15:14:19 -07:00
W. Trevor King 3ed95897c3 runtime-config-linux: Drop 'Linux' from headers
The fact that these are Linux-specific entities should be obvious from
the context (this whole file is only about Linux-specific entities).

Signed-off-by: W. Trevor King <wking@tremily.us>
2015-08-26 13:32:27 -07:00
W. Trevor King 2854504cf7 bundle: Move 'Linux sysctl' header to its own line
This fixes a copy/paste issue with 7232e4b1 (specs: introduce the
concept of a runtime.json, 2015-07-30, #88).

Signed-off-by: W. Trevor King <wking@tremily.us>
2015-08-26 13:31:29 -07:00
Brandon Philips 7232e4b137 specs: introduce the concept of a runtime.json
Based on our discussion in-person yesterday it seems necessary to
separate the concept of runtime configuration from application
configuration. There are a few motivators:

- To support runtime updates of things like cgroups, rlimits, etc we
  should separate things that are inherently runtime specific from
  things that are static to the application running in the container.

- To support the goal of being able to move a bundle between hosts we
  should make it clear what parts of the spec are and are not portable
  between hosts so that upon landing on a new host the non-portable
  options may be rewritten or removed.

- In order to attach a cryptographic identity to a bundle we must not
  include details in the bundle that are host specific.
2015-08-26 09:44:09 -07:00