jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,721 Commits 5 Branches 25 Tags 17 MiB
Commit Graph

1721 Commits

Author SHA1 Message Date
Mrunal Patel 486ac97618 Merge pull request #236 from hqhq/hq_fix_cgroup_rw 
Always remount for bind mount
 2015-09-14 12:08:34 -07:00
Michael Crosby c4780db6a5 Merge pull request #266 from rajasec/seccompfix 
make localtest failure on removing seccomp flag in Makefile
 2015-09-14 12:00:08 -07:00
Rajasekaran 2940f73a14 make localtest failure on removing seccomp flag 
Signed-off-by: Rajasekaran <rajasec79@gmail.com>
 2015-09-12 14:43:55 +05:30
Mrunal Patel ef9471fd5b Merge pull request #253 from avagin/cr-cgroups 
c/r: create cgroups to restore a container
 2015-09-11 18:03:40 -07:00
Mrunal Patel 8660fd2325 Merge pull request #265 from crosbymichael/tags 
Add all support build tags for runc features
 2015-09-11 12:16:37 -07:00
Michael Crosby 3200c16937 Add all support build tags for runc features 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-09-11 12:12:18 -07:00
Alexander Morozov b0fd9fb75a Merge pull request #220 from crosbymichael/build-tags 
Add seccomp build tag
 2015-09-11 12:06:27 -07:00
Michael Crosby a8e0185d97 Add seccomp build tag 
Add a seccomp build tag and also support in the Makefile to add or
remove build tags.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-09-11 12:03:57 -07:00
Alexander Morozov 7d122ff30e Merge pull request #261 from crosbymichael/hooks 
Implement hooks in libcontainer code base
 2015-09-11 11:43:49 -07:00
David Calavera 0f28592b35 Turn hook pointers into values. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-09-11 11:34:34 -07:00
Michael Crosby dd969cbacd Add test for function based hooks 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-09-10 18:15:00 -07:00
Mrunal Patel 1dca365393 Add test for prestart hook 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>

Conflicts:
	libcontainer/integration/exec_test.go
 2015-09-10 17:59:36 -07:00
Michael Crosby 05567f2c94 Implement hooks in libcontainer 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-09-10 17:57:31 -07:00
Mrunal Patel cd01b01018 Merge pull request #259 from hqhq/hq_fix_cgroup 
Fix bug in find cgroup mount point dir
 2015-09-10 12:01:22 -07:00
Andrey Vagin df39686c93 c/r: create cgroups to restore a container 
Here are two reasons:
* If we use systemd, we need to ask it to create cgroups
* If a container is restored with another ID, we need to
  change paths to cgroups.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
 2015-09-10 21:00:27 +03:00
Andrey Vagin da2535f2d1 mount: don't read /proc/self/cgroup many times 
Signed-off-by: Andrey Vagin <avagin@openvz.org>
 2015-09-10 21:00:22 +03:00
Andrey Vagin e49c1dc559 Rework ParseCgroupFile 
Currently we parse /proc/self/cgroup for each controller.
It's ineffective.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
 2015-09-10 20:59:27 +03:00
Qiang Huang b94fe5b7f8 Fix bug in find cgroup mount point dir 
Bug was introduced in #250

According to: http://man7.org/linux/man-pages/man5/proc.5.html

36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw,errors=continue
(1)(2)(3)   (4)   (5)      (6)      (7)   (8) (9)   (10)         (11)
...
(7)  optional fields: zero or more fields of the form
       "tag[:value]".
The 7th field is optional. We should skip it when parsing mount info.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-09-10 08:29:12 +08:00
Mrunal Patel 5731a045fe Merge pull request #250 from hqhq/hq_cgroup_cleanup 
Some cgroups cleanup
 2015-09-09 11:48:02 -07:00
Qiang Huang f2ec7eff7e Rename FindCgroupMountpointAndSource 
Rename it to FindCgroupMountpointAndRoot.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-09-09 09:29:11 +08:00
Qiang Huang bc67941c72 Parse directly in FindCgroupMountpointDir 
Unify it with FindCgroupMountpoint, and add comments why
we should to do this.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-09-09 09:28:50 +08:00
Mrunal Patel 0f85e4e1a3 Merge pull request #239 from rajasec/restore-leaverunning 
Restorefixforrunningcontainer
 2015-09-02 11:21:30 -07:00
Alexander Morozov 05b1cda5dd Merge pull request #235 from hqhq/hq_fix_cgroup_test 
Fix cgroup mount tests
 2015-09-01 14:57:44 -07:00
Mrunal Patel 5c92e5d7e0 Merge pull request #232 from vishh/oom-score-adj 
Adding oom_score_adj as a container config param
 2015-08-31 14:45:29 -07:00
Vishnu Kannan cc232c4707 Adding oom_score_adj as a container config param. 
Signed-off-by: Vishnu Kannan <vishnuk@google.com>
 2015-08-31 14:02:59 -07:00
Rajasekaran 77af09efd6 Restorefixforrunningcontainer 
Signed-off-by: Rajasekaran <rajasec79@gmail.com>
 2015-08-31 22:16:38 +05:30
Mrunal Patel 8447547797 Merge pull request #233 from shishir-a412ed/comment_move 
cleanup: outdated comment
 2015-08-31 09:27:34 -07:00
Qiang Huang 085f465c00 Fix cgroup mount tests 
I got:
```
exec_test.go:823: Mode expected to contain 'ro,nosuid,nodev,noexec': tmpfs on /sys/fs/cgroup type tmpfs (ro,seclabel,nosuid,nodev,noexec,relatime,mode=755
```wq

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-31 11:23:18 +08:00
Qiang Huang b7385e291c Always remount for bind mount 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-31 11:10:34 +08:00
Shishir Mahajan 0f3545e3d3 cleanup: outdated comment 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-08-29 11:50:39 -04:00
Michael Crosby b1e7041957 Merge pull request #165 from calavera/context_labels 
Make label.Relabel safer.
 2015-08-28 14:20:00 -07:00
Mrunal Patel 9c1e298b0e Merge pull request #179 from crosbymichael/debug-log 
Add --log flag
 2015-08-28 13:12:50 -07:00
Mrunal Patel 8b18c9af08 Merge pull request #229 from booyaa/doc_linux_only 
Add caveat will only build on Linux as per #9
 2015-08-28 11:29:07 -07:00
Mrunal Patel 525b3710d8 Merge pull request #231 from shishir-a412ed/socket_activation 
Systemd integration with runc, for on-demand socket activation
 2015-08-28 11:28:46 -07:00
Alexander Morozov 37c506058d Merge pull request #221 from crosbymichael/defaults-criu 
Remove hard-coded default for tcp connections
 2015-08-28 11:24:36 -07:00
Shishir Mahajan 6b9d64eefe Systemd integration with runc, for on-demand socket activation 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-08-28 14:24:01 -04:00
Alexander Morozov 98e6e70cf3 Merge pull request #214 from rajasec/restorefix 
Restore container cleanup
 2015-08-28 10:49:09 -07:00
Michael Crosby 5a3ebbdb1f Add --debug-log flag 
Add a `--debug-log` flag for specifying a path to write the debug logs
to for runc.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-08-28 10:48:52 -07:00
Michael Crosby 5e75a12ec1 Merge pull request #224 from marcosnils/master 
Update README config file devices
 2015-08-28 10:46:09 -07:00
Michael Crosby b9c32b3869 Merge pull request #223 from rajasec/rlimitspec 
Adding rlimit in spec
 2015-08-28 10:34:59 -07:00
Mrunal Patel 1cb571f800 Merge pull request #228 from mheon/seccomp_config 
Connect Seccomp configuration in Spec to backend
 2015-08-28 10:32:42 -07:00
Mrunal Patel 7797873f1b Merge pull request #230 from shishir-a412ed/error_check_load_spec 
Error should be checked after loadSpec
 2015-08-27 08:18:47 -07:00
Shishir Mahajan 432dcede36 Error should be checked after loadSpec 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-08-27 11:03:43 -04:00
Mark Sta Ana a491b93ff3 Add caveat will only build on Linux as per #9 
Signed-off-by: Mark Sta Ana <booyaabooyaabooyaa@gmail.com>
 2015-08-27 08:50:46 +01:00
Matthew Heon 2ee6d1e8b6 Connect Seccomp configuration in Spec to configuration in Libcontainer 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2015-08-25 17:35:06 -04:00
Mrunal Patel 7291a52148 Merge pull request #210 from duglin/AddExecCmd 
Add a 'start' command
 2015-08-25 08:21:23 -07:00
Mrunal Patel 2f4c229a8c Merge pull request #215 from boucher/huikang-patch 
Add hooks for passing explicit veth pairs for forwarding to CRIU
 2015-08-24 21:23:29 -07:00
Rajasekaran fc97aa44e1 Updating README for rlimit 
Signed-off-by: Rajasekaran <rajasec79@gmail.com>

Fixing indentation issue in README

Signed-off-by: Rajasekaran <rajasec79@gmail.com>
 2015-08-25 06:02:59 +05:30
Hui Kang 7f23085c82 Add hooks for passing explicit veth pairs for forwarding to CRIU. 
Signed-off-by: Hui Kang <hkang.sunysb@gmail.com>
 2015-08-24 09:26:39 -07:00
Rajasekaran ab4b825f8c Adding rlimit in spec 
Signed-off-by: Rajasekaran <rajasec79@gmail.com>

Removing return type

Signed-off-by: Rajasekaran <rajasec79@gmail.com>
 2015-08-24 21:33:36 +05:30