Michael Crosby
5edcda910e
Improve seccomp API
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Conflicts:
configs/config.go
container_linux.go
seccomp/seccomp.go
seccomp/seccomp.test
2015-06-05 11:21:40 -07:00
yangshukui
4a99434e8b
add the generated go file
...
Signed-off-by: Yang Shukui <yangshukui@huawei.com>
2015-06-05 11:21:40 -07:00
yangshukui
12a41c825d
seccomp surport filter args
...
1. add args surport for seccomp
2. add CLONE_SECCOMP flag for preventing seccomp feature
Signed-off-by: Yang Shukui <yangshukui@huawei.com>
2015-06-05 11:21:40 -07:00
yangshukui
02e05e0884
Add seccomp feature
...
add seccomp feature which is not use third-party
add multi arch surport
add test case
all code use golang
this pr is relate to #511 because I close it and find it can not be reopen
Signed-off-by: Yang Shukui <yangshukui@huawei.com>
2015-06-05 11:21:40 -07:00
Victor Marmol
ce1f2f1c86
Merge pull request #614 from LK4D4/fix_validate
...
Fix hack/validate.sh
2015-06-05 08:37:51 -07:00
Alexander Morozov
07493c68a8
Merge pull request #615 from kvasdopil/freebsd-compile2
...
make libcontainer compile on freebsd (again)
2015-06-05 07:37:07 -07:00
Alexey Guskov
f66187d234
make libcontainer compile on freebsd (again)
...
Signed-off-by: Alexey Guskov <lexag@mail.ru>
2015-06-05 14:23:32 +03:00
Alexander Morozov
7da5189e67
Fix hack/validate.sh
...
Was broken because of update in docker
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-04 14:14:19 -07:00
Mrunal Patel
57a50dd378
Merge pull request #611 from thaJeztah/update-dockerproject-link
...
Update dockerproject.com links
2015-06-03 14:45:38 -07:00
Sebastiaan van Stijn
68556a6d07
Update dockerproject.com links
...
The dockerproject.com domain is moving to dockerproject.org
this changes the buildstatus link to point to the new
domain.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-06-03 23:13:22 +02:00
Victor Marmol
be81d577fd
Merge pull request #567 from Mashimiao/support-hugetlb-set-and-getstats
...
hugetlb: Add support of Set and GetStats function
2015-06-02 09:55:28 -07:00
Mrunal Patel
6d58edf698
Merge pull request #608 from davexunit/fix-spec
...
spec: Fix errors in file system mount points table.
2015-05-31 19:06:21 -07:00
David Thompson
7d54664fb8
spec: Fix errors in file system mount points table.
...
"shm" is not a valid file system type, and there must be an "=" between
"gid" and "5" in the devpts options.
Signed-off-by: David Thompson <davet@gnu.org>
2015-05-31 18:17:31 -04:00
Alexander Morozov
3d47519162
Merge pull request #607 from WeiZhang555/bug
...
bug fix: slice bounds out of range
2015-05-30 08:30:58 -07:00
Zhang Wei
9c2893eb28
bug fix: slice bounds out of range
...
If TestGenerateName() accept size parameter larger than 64, it will panic.
This patch fix this potential panic bug.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-05-30 11:50:15 +08:00
Michael Crosby
60d043931b
Merge pull request #602 from runcom/fix-race-manager-stats-paths
...
Fix race in stats Manager
2015-05-28 10:23:29 -07:00
Michael Crosby
5f69c650e5
Merge pull request #605 from ZJU-SEL/update_nsinit_readme
...
Update nsinit readme for C/R
2015-05-28 10:22:13 -07:00
Antonio Murdaca
81444369c6
Add mutex in Manager to read from m.Paths
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-28 12:09:27 +02:00
Daniel, Dao Quang Minh
31496b37b5
Merge pull request #592 from Mashimiao/cgroup-memory-enchancement
...
cgroup memory: Enchance stats support of memory
2015-05-28 13:57:00 +08:00
Ma Shimiao
4002033269
hugetlb: Add support of Set and GetStats function
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-28 13:09:49 +08:00
Ma Shimiao
11d2aa07a0
cgroup memory: Enchance stats support of memory
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-28 09:09:01 +08:00
Mrunal Patel
97f4592aa8
Merge pull request #606 from kvasdopil/freebsd-compile
...
Process.go can compile on FreeBSD
2015-05-27 11:24:21 -07:00
Alexey Guskov
6bdfd8fcfd
process.go can compile on FreeBSD
...
Signed-off-by: Alexey Guskov <lexag@mail.ru>
2015-05-27 15:41:50 +03:00
jianbosun
f177920dc3
Update nsinit readme for C/R
...
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
2015-05-26 16:39:35 +08:00
Michael Crosby
8c6ed5ebe0
Merge pull request #599 from avagin/test
...
integration: don't ignore exit codes of test processes
2015-05-21 13:35:02 -07:00
Michael Crosby
35d1c0e479
Merge pull request #479 from docker/criu
...
WIP: Add Checkpoint and Restore support to libcontainer
2015-05-21 13:32:40 -07:00
Michael Crosby
703d9a1554
Merge pull request #600 from boucher/criu-readme
...
README example for using checkpoint/restore.
2015-05-21 10:02:09 -07:00
boucher
fee819ca06
README example for using checkpoint/restore.
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-20 17:59:19 -07:00
Michael Crosby
e7542142a8
Remove logging for checkpoint code
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-20 15:48:07 -07:00
Andrey Vagin
5f6ea0e8a4
cr: fix parsing of criu version
...
The format of criu version is X.Y[.Z]. The current code can not parse X.Y,
because scanf returns the "input does not match format" error.
Signed-off-by: Andrey Vagin <avagin@openvz.org>
2015-05-20 15:19:30 -07:00
boucher
206b5e6f1d
First attempt at an integration test for checkpoint/restore.
...
Adds iptables as a requirement of criu in the Dockerfile.
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-20 15:19:30 -07:00
boucher
b3ec1fce19
Add steps to install criu to the Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-20 15:19:30 -07:00
boucher
bfb093aacd
Allow restore to actually exec/create the libcontainer, rather than requiring that one already exists.
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-20 15:19:30 -07:00
Andrey Vagin
a16d7f1b7d
container: don't use c.initProcess before it's set
...
container.Checkpoint() doesn't clear c.initProcess and
it's used on restore.
Signed-off-by: Andrew Vagin <avagin@openvz.org>
2015-05-20 15:19:30 -07:00
boucher
420180a10b
Require criu 1.5.2 rather than 1.5.1
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-20 15:19:30 -07:00
boucher
7c138ebbee
Reformat some error handling code and declare descriptor filename as a const.
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-20 15:19:30 -07:00
Andrey Vagin
7d32656ee7
cr: handle all external descriptros in ct.Restore()
...
Signed-off-by: Andrey Vagin <avagin@openvz.org>
2015-05-20 15:19:30 -07:00
boucher
78a21b77b2
Fix formatting issues, and missing test methods.
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-20 15:19:30 -07:00
Andrey Vagin
8f0cad54ac
Don't fix the size of the ExternalDescriptors array
...
In a future we may want to have more external descriptors.
Signed-off-by: Andrey Vagin <avagin@openvz.org>
2015-05-20 15:19:30 -07:00
Andrey Vagin
655f1ce09c
Rename StdFds into ExternalDescriptors
...
Signed-off-by: Andrey Vagin <avagin@openvz.org>
2015-05-20 15:19:30 -07:00
Andrey Vagin
6ecf32c234
Restore StdFds from the state file
...
Signed-off-by: Andrey Vagin <avagin@openvz.org>
2015-05-20 15:19:29 -07:00
boucher
3d59a7fe8b
Refactor saving fds slightly, set the restored process fds correctly.
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-20 15:19:29 -07:00
boucher
38635c5a11
Move the std_fds into initProcess, and expose them in container's State
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-20 15:19:29 -07:00
boucher
129280ac62
Write the fd info to the image directory during a checkpoint,
...
and restore with the written info from a given image directory.
Also, write completely root independent ext_mount info.
These changes enable checkpointing in one container and then restoring
into a completely new container.
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-20 15:18:56 -07:00
Hui Kang
46dd56ba07
Change back to --page-server, PageServer should be in CriOpts struct
...
Docker-DCO-1.1-Signed-off-by: Hui Kang <hkang.sunysb@gmail.com>
2015-05-20 15:18:56 -07:00
Hui Kang
1d89a25aec
Fix a nil pointer bug when doing local checkpoint
...
Docker-DCO-1.1-Signed-off-by: Hui Kang <hkang.sunysb@gmail.com>
2015-05-20 15:18:56 -07:00
Hui Kang
67636f13fb
Change --page-server to --PageServer
...
Docker-DCO-1.1-Signed-off-by: Hui Kang <hkang.sunysb@gmail.com>
2015-05-20 15:18:56 -07:00
Hui Kang
d278b830d9
Change criu command line format for page server
...
--page-server ADDRESS:PORT
Docker-DCO-1.1-Signed-off-by: Hui Kang <hkang.sunysb@gmail.com>
2015-05-20 15:18:56 -07:00
root
7a012fe3b5
Allow dumped image to be transferred to a criu page server
...
--page-server to specify the IP address of criu page server
--port to specify the port of the criu page server
Docker-DCO-1.1-Signed-off-by: Hui Kang <hkang.sunysb@gmail.com>
2015-05-20 15:18:56 -07:00
boucher
4fc7543317
Don't write a "checkpoint" file if the process is left running.
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-20 15:18:56 -07:00