26ebd6ab63
Merge pull request #1102 from datawolf/Revert-simplify-ps-command
...
Revert "simplify ps command"
2016-10-11 03:53:28 +02:00
1a6391b03f
Revert "simplify ps command"
...
This reverts commit 067ce21f7a
2016-10-10 09:27:07 +08:00
45c30e75ab
Merge pull request #784 from hqhq/hq_ps_following_up
...
Add integration test for ps command
2016-10-07 15:23:04 -07:00
2ad2cf7b28
Merge pull request #1092 from datawolf/simplify-ps-command
...
simplify ps command
2016-10-07 15:16:31 -07:00
d1fc802264
Merge pull request #1095 from crosbymichael/kmem
...
Don't enable kernel mem if not set
2016-10-07 21:59:56 +02:00
11222ee1f1
Don't enable kernel mem if not set
...
Don't enable the kmem limit if it is not specified in the config.
Fixes #1083
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-10-07 10:02:19 -07:00
b1eb19b4f3
merge branch 'pr-1084'
...
LGTMs: @mrunalp @cyphar
Closes #1084
2016-10-07 19:10:14 +11:00
02f8fa7863
Merge pull request #1089 from mlaventure/fix-logging-on-error
...
Ensure we log into logrus on command error
2016-10-03 09:42:46 -07:00
294d24fb1a
Ensure we log into logrus on command error
...
`urfave/cli` now takes upon itself to log the error returned by the
command action directly. This means that by default the `--log` option
was ignored upon error.
This commit ensure that `urfave/cli.ErrWriter` will use logrus
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-03 08:01:09 -07:00
7b1bcb3762
Merge pull request #1090 from crosbymichael/bind-root
...
Remove check for binding to /
2016-09-30 14:42:30 -07:00
067ce21f7a
simplify ps command
...
the `-p pidlist` flag of `ps` command selects the process whose process
ID numbers apper in `pidlist`.[1]
This patch use `-p pidlist` to filter process which we want.
[1]: http://man7.org/linux/man-pages/man1/ps.1.html
Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-09-30 14:54:30 +08:00
70b16a5ab9
Remove check for binding to /
...
In order to mount root filesystems inside the container's mount
namespace as part of the spec we need to have the ability to do a bind
mount to / as the destination.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-29 15:26:09 -07:00
98afb7390a
Add integration test for ps command
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-09-29 18:33:32 +08:00
3597b7b743
Merge pull request #1087 from williammartin/master
...
Fix typo when container does not exist
2016-09-29 09:19:45 +08:00
c91b5bea48
Merge pull request #1088 from crosbymichael/rc2
...
Bump spec and version to rc2
2016-09-29 09:18:37 +08:00
b3833a00e6
Merge pull request #1086 from justincormack/ambient
...
Set ambient capabilities where supported
2016-09-28 10:00:00 -07:00
0f97ba469f
Bump spec and version to rc2
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-28 09:53:43 -07:00
3d777789a2
Merge pull request #1081 from ggaaooppeenngg/gaopeng/replace-range-map
...
Refactor enum map range to slice range
2016-09-28 09:50:38 -07:00
152169ed34
Fix typo when container does not exist
...
Signed-off-by: William Martin <wmartin@pivotal.io>
2016-09-28 11:00:50 +00:00
d9fec4c63b
Merge pull request #1065 from keloyang/remove-ps-workaround
...
Remove the workaround which add a -- flag to runc ps command
2016-09-28 17:09:58 +08:00
4e179bddca
Set ambient capabilities where supported
...
Since Linux 4.3 ambient capabilities are available. If set these allow unprivileged child
processes to inherit capabilities, while at present there is no means to set capabilities
on non root processes, other than via filesystem capabilities which are not usually
supported in image formats.
With ambient capabilities non root processes can be given capabilities as well, and so
the main reason to use root in containers goes away, and capabilities work as expected.
The code falls back to the existing behaviour if ambient capabilities are not supported.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-28 09:13:56 +01:00
c5393da813
Refactor enum map range to slice range
...
grep -r "range map" showw 3 parts use map to
range enum types, use slice instead can get
better performance and less memory usage.
Signed-off-by: Peng Gao <peng.gao.dut@gmail.com>
2016-09-28 15:36:29 +08:00
1a75f815d5
systemd cgroup driver supports slice management
...
Signed-off-by: derekwaynecarr <decarr@redhat.com>
2016-09-27 16:01:37 -04:00
1359131f4a
Merge pull request #1080 from hqhq/fix_user_test
...
Fix TestGetAdditionalGroups on i686
2016-09-27 10:18:27 -07:00
2940d2e2e9
Merge pull request #1069 from datawolf/add-unittest
...
[integration] add testcases for `runc delete` command
2016-09-27 19:20:36 +08:00
dc0a4cf488
Fix TestGetAdditionalGroups on i686
...
Fixes : #941
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-09-27 18:25:53 +08:00
6cbd8e20ef
Merge pull request #1076 from rajasec/checkpoint-create
...
Container must not checkpoint in created state
2016-09-26 23:53:41 +01:00
cce5713940
Merge pull request #1077 from rajasec/readme-container-usage
...
Updating libcontainer README for container run
2016-09-26 23:52:06 +01:00
282b254073
Merge pull request #1068 from AkihiroSuda/maskdir
...
MaskPaths: support directory
2016-09-26 13:10:40 -07:00
74317eaa20
Merge pull request #1072 from keloyang/dbuild
...
Bug fix for make dbuild
2016-09-26 10:57:59 -07:00
4853f3b628
Bug fix for make dbuild
...
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
2016-09-26 12:04:50 +08:00
c1d967f055
Updating libcontainer README for container run
...
Signed-off-by: rajasec <rajasec79@gmail.com>
2016-09-25 23:02:55 +05:30
a60040c62d
Container must not checkpoint in created state
...
Signed-off-by: rajasec <rajasec79@gmail.com>
2016-09-25 21:09:23 +05:30
cc0e2d567f
Remove the workaround which add a -- flag to runc exec command and add integration for exec ls -la
...
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
2016-09-24 12:21:50 +08:00
993126259c
Remove the workaround which add a -- flag to runc ps command and add integration for ps -eaf
...
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
2016-09-24 12:20:52 +08:00
53179559a1
MaskPaths: support directory
...
For example, the /sys/firmware directory should be masked because it can contain some sensitive files:
- /sys/firmware/acpi/tables/{SLIC,MSDM}: Windows license information:
- /sys/firmware/ibft/target0/chap-secret: iSCSI CHAP secret
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-23 16:14:41 +00:00
e72a4e5bd2
[integration] add testcases for `runc delete` command
...
this patch add two testcases for the `runc delete` with
multi-containers. see : https://github.com/opencontainers/runc/pull/1053
Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-09-23 15:35:50 +08:00
e83ccf62aa
Merge pull request #1063 from datawolf/test-error-code
...
[unittest] add extra ErrorCode in TestErrorCode testcase
2016-09-23 11:55:44 +08:00
650c97a111
Merge branch 'pr-1051'
...
LGTM: @cyphar @crosbymichael
Closes #1051
2016-09-23 12:13:34 +10:00
6b8f696614
Merge pull request #1053 from datawolf/enhance-runc-delete
...
enhance runc delete command
2016-09-22 16:51:10 -07:00
5653ced544
Merge pull request #1059 from datawolf/use-WriteCgrougProc
...
cgroup: using WriteCgroupProc to write the specified pid into the cgroup's cgroup.procs file
2016-09-22 11:31:35 -07:00
bb792edd31
Merge pull request #1058 from datawolf/update-pause-comment
...
update the comment for container.Pause() method on linux
2016-09-22 11:31:07 -07:00
20c7c3bb37
Merge pull request #1049 from mrunalp/getcgroups_all
...
Add flag to allow getting all mounts for cgroups subsystems
2016-09-22 11:15:39 -07:00
132f5ee7d4
[unittest] add extra ErrorCode in TestErrorCode testcase
...
Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-09-22 20:15:54 +08:00
a2a6e828a9
Merge pull request #1048 from crosbymichael/state-json
...
Use same state object for state and list
2016-09-22 19:48:43 +08:00
09fd10eb2d
Merge pull request #1060 from YummyPeng/fix-typo
...
Fix typo
2016-09-21 12:31:04 -07:00
6ed0652ee0
Fix typo
...
Signed-off-by: Yuanhong Peng <pengyuanhong@huawei.com>
2016-09-21 20:13:32 +08:00
ce9951834c
cgroup: using WriteCgroupProc to write the specified pid into the cgroup's cgroup.procs file
...
cgroupData.join method using `WriteCgroupProc` to place the pid into
the proc file, it can avoid attach any pid to the cgroup if -1 is
specified as a pid.
so, replace `writeFile` with `WriteCgroupProc` like `cpuset.go`'s
ApplyDir method.
Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-09-21 10:57:03 +00:00
ce5d8cf941
Merge pull request #1056 from datawolf/remove-duplicate-test
...
remove duplicate test command on integration
2016-09-20 09:57:39 -07:00
59a241f647
update the comment for container.Pause() method on linux
...
if a container state is running or created, the container.Pause()
method can set the state to pausing, and then paused.
this patch update the comment, so it can be consistent with the code.
Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-09-20 10:49:04 +08:00
Qiang Huang
Wang Long
Michael Crosby
Aleksa Sarai
Mrunal Patel
Kenfe-Mickael Laventure
William Martin
Justin Cormack
Peng Gao
derekwaynecarr
Daniel, Dao Quang Minh
Shukui Yang
rajasec
Akihiro Suda
Yuanhong Peng