Commit Graph

2397 Commits

Author SHA1 Message Date
Michael Crosby 231da98242 Merge pull request #737 from mrunalp/import_fix
Fix broken build due to missing import
2016-04-08 16:46:11 -07:00
Mrunal Patel b24892c6b3 Fix broken build due to missing import
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-04-08 16:35:20 -07:00
Alexander Morozov 1bef485001 Merge pull request #735 from mrunalp/mcs_race
Synchronize writes to mcs map
2016-04-08 14:37:53 -07:00
Mrunal Patel 278cc30557 Merge pull request #734 from crosbymichael/hook-error
Report hook output on error
2016-04-08 14:34:58 -07:00
Mrunal Patel c6cfce304b Synchronize writes to mcs map
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-04-08 14:16:00 -07:00
Michael Crosby bee8cb5fbb Report hook output on error
Fixes #733

This reports the stdout/err for a hook if it returns a non-zero exit
status.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-04-08 11:02:44 -07:00
Dan Walsh ff066b84ce Add label.GetFileLabel interface
One of our volume plugins needs to get the label of the target mount point
so that it can set the content inside of the volume to match.

We need label.GetFileLabel() to make this work.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-04-08 13:10:37 -04:00
Michael Crosby 865f4a685d Merge pull request #729 from mrunalp/fix_build
Fix the build by removing go get for vet
2016-04-07 10:29:49 -07:00
Mrunal Patel f3c6d9e7cc Fix the build by removing go get for vet
golang.org/x/tools/cmd/vet has been removed as it is available in go cmd directly

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-04-07 09:36:08 -07:00
Qiang Huang 284c72448d Merge pull request #722 from rajasec/readme-signal
Updating README with container signal interaction
2016-04-07 14:37:51 +08:00
Mrunal Patel d4f77606f1 Merge pull request #718 from albertoleal/validator-unittests
Add unit tests for validate.Validator
2016-04-06 09:34:32 -07:00
Mrunal Patel c6f3e8e8ef Merge pull request #723 from albertoleal/master
Typo on Readme file.
2016-04-06 09:32:34 -07:00
George Lestaris f7ae27bfb7 HookState adhears to OCI
Signed-off-by: George Lestaris <glestaris@pivotal.io>
Signed-off-by: Ed King <eking@pivotal.io>
2016-04-06 16:57:59 +01:00
Alberto Leal 7ec83f8b38 Typo on Readme file
Signed-off-by: Alberto Leal <albertonb@gmail.com>
2016-04-06 15:15:11 +01:00
Alberto Leal dca2d12760 Add unit tests for validate.Validator
Signed-off-by: Alberto Leal <albertonb@gmail.com>
2016-04-06 11:18:11 +01:00
Mrunal Patel 3f4f4420fd Merge pull request #592 from hqhq/hq_fix_update_memory
Fix problem when update memory and swap memory
2016-04-05 10:19:33 -07:00
rajasec 57f2ae5d72 Updating README with container signal interaction
Signed-off-by: rajasec <rajasec79@gmail.com>
2016-04-05 19:41:27 +05:30
Alexander Morozov 6c88a526cd Merge pull request #716 from crosbymichael/bump-spec-apr1
Bump spec for masked and readonly paths
2016-04-04 11:58:06 -07:00
Mrunal Patel 5a0594f013 Merge pull request #721 from rajasec/rlimit-sigpending
Fixing rlimit sigpending value
2016-04-04 10:36:52 -07:00
rajasec 8889167f4d Fixing rlimit sigpending value
Signed-off-by: rajasec <rajasec79@gmail.com>
2016-04-03 22:25:41 +05:30
Michael Crosby df25eddce6 Add spec support for masked and readonly paths
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-04-01 13:04:47 -07:00
Michael Crosby 1117a7cbf9 Bump specs to 93ca97e83c
This bumps specs to version 93ca97e83c
which fixes the json marshal/unmarshal issue with blkio major/minor and
adds masked and readonly paths to the spec.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-04-01 13:00:44 -07:00
Qiang Huang 89ab7f2ccc Merge pull request #712 from mrunalp/comment_fixup
Fixup incorrect package name in a comment
2016-03-31 17:02:02 +08:00
Mrunal Patel 0c1c615ebd Merge pull request #711 from rhatdan/sysctl
Return a more meaningful error when namespaces are disabled
2016-03-30 15:35:06 -07:00
Mrunal Patel 79a2479099 Fixup incorrect pacakge name in a comment
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-03-30 14:48:19 -07:00
Alexander Morozov 2441732d6f Merge pull request #710 from crosbymichael/no-pivot
Add --no-pivot option for containers on ramdisk
2016-03-30 13:57:24 -07:00
Aleksa Sarai 0a5293fa4e Merge pull request #708 from cyphar/treat-numric-ids-properly
libcontainer: user: always treat numeric ids numerically
2016-03-31 07:52:26 +11:00
Aleksa Sarai 3cfff676b1 libcontainer: user: general cleanups
Some of the code was quite confusing inside libcontainer/user, so
refactor and comment it so future maintainers can understand what's
going and what edge cases we have to deal with.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-03-31 07:44:16 +11:00
Aleksa Sarai 4468dd5890 libcontainer: user: add tests for numeric user specifications
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-03-31 07:44:16 +11:00
Aleksa Sarai 69af385de6 libcontainer: user: always treat numeric ids numerically
Most shadow-related tools don't treat numeric ids as potential
usernames, so change our behaviour to match that. Previously, using an
explicit specification like 111:222 could result in the UID and GID not
being 111 and 222 respectively (which is confusing).

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-03-31 07:33:31 +11:00
Dan Walsh d2a39ea043 Return a more meaningful error when namespaces are disabled
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-03-30 16:16:24 -04:00
Michael Crosby 12bd4cffd0 Add --no-pivot option for containers on ramdisk
This adds a `--no-pivot` cli flag to runc so that a container's rootfs
can be located ontop of ramdisk/tmpfs and not fail because you cannot
pivot root.

This should be a cli flag and not part of the spec because this is a
detail of the host/runtime environment and not an attribute of a
container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-30 12:02:17 -07:00
Aleksa Sarai 534d7a8ee4 Makefile: install to /usr/local/sbin
Since runC requires root in order to run, it makes more sense to put it
in /usr/local/sbin (which is traditionally for root-only utilities).
This also fixes the section number mismatch (man8 is usually for
administrative utilities in /usr/local/sbin).

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-03-31 01:15:05 +11:00
Qiang Huang 8fa5343b00 Merge pull request #703 from crosbymichael/delete
Remove container root dir from an aborted start
2016-03-30 10:39:07 +08:00
Qiang Huang 2c303f3893 Merge pull request #706 from crosbymichael/spec-timeout
Bump spec and implement hook timeout
2016-03-30 10:33:05 +08:00
Michael Crosby 6f84d902ca Implement hook timeouts
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-29 11:14:59 -07:00
Michael Crosby 4d431183be Update spec to version cf8ebc9d6e
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-29 11:14:35 -07:00
Michael Crosby fb0dfe068c Remove container root dir from an aborted start
If runc was SIGKILL'd or something happened and the container was not
able to start and runc died as well then we could get into the state
where `$root/<containerid>` exists but `$root/<containerid>/state.json`
does not.  This will not allow libcontainer to load the container to
call the delete function as it has no data on the container other than
its id.  We should just remove it in runc so that that system matches
what runc sees for the container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-29 10:27:19 -07:00
Mrunal Patel e55fcbda8a Merge pull request #683 from thtanaka/mqueue-label
Only perform mount labelling when necessary
2016-03-29 09:30:43 -07:00
Michael Crosby ed03709656 Merge pull request #700 from marcosnils/tests_fix
Fix hanging tests when run without root
2016-03-28 16:47:26 -07:00
Mrunal Patel 851c050340 Merge pull request #686 from hqhq/hq_refactor_nsexec
Refactor nsexec.c and add some comments
2016-03-28 09:36:06 -07:00
Mrunal Patel 857d418b09 Merge pull request #698 from ggaaooppeenngg/gaopeng/format-errorf
Use %v for map structure format
2016-03-28 09:28:28 -07:00
Qiang Huang d9520aeba4 Close opened files before exit
Not to say it'll cause memory leak, it'll still be a
good practice.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-03-28 11:16:34 +08:00
Qiang Huang 3b7e10652b Refactor nsexec.c and add some comments
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-03-28 11:16:12 +08:00
Qiang Huang d8b8f76c4f Fix problem when update memory and swap memory
Currently, if we start a container with:
`docker run -ti --name foo --memory 300M --memory-swap 500M busybox sh`

Then we want to update it with:
`docker update --memory 600M --memory-swap 800M foo`

It'll get error because we can't set memory to 600M with
the 500M limit of swap memory.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-03-28 10:48:29 +08:00
Mrunal Patel f5ad78dc49 Merge pull request #699 from ggaaooppeenngg/gaopeng/fix-typo
Fix typo
2016-03-27 16:27:52 -07:00
Marcos Lilljedahl 61ffdc0661 Fix hanging tests when run without root
Fixes #692

Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>
2016-03-27 01:53:01 -03:00
Peng Gao 3fa246609c Fix typo
Signed-off-by: Peng Gao <peng.gao.dut@gmail.com>
2016-03-27 12:44:16 +08:00
Peng Gao ffbc626e53 Use %v for map structure format
Based on Golang document, %s is for "the uninterpreted bytes of the
string or slice", so %v is more appropriate.

Signed-off-by: Peng Gao <peng.gao.dut@gmail.com>
2016-03-26 23:28:59 +08:00
Mrunal Patel 519529febe Merge pull request #696 from hartzler/fix-libcontainer-doc
Fix libcontainer README.md example config
2016-03-25 21:24:12 -07:00