9dc17dc9b4
Merge pull request #537 from hqhq/hq_cleanup_cpushares_check
...
cleanup cpushares check
2015-04-17 14:32:07 -07:00
f2cf36412c
Merge pull request #538 from hqhq/hq_fix_freeze_test
...
fix freeze systemd test
2015-04-17 10:53:38 -07:00
dc480bc3ad
add integration test for premount/postmount hooks
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-04-17 08:28:17 -04:00
59eb58b640
cgroups: add support blkio.throttle.read/write_*
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-17 16:03:42 +08:00
f010150f7d
fix freeze systemd test
...
Made a mistake before, freeze test doesn't use newContainer,
systemd test doesn't actually work.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-17 14:20:16 +08:00
62fccb3e1e
add test case for cpuShares check
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-17 13:51:37 +08:00
e161ceccbe
cleanup duplicate code for cpuShares check
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-17 13:18:44 +08:00
59c5c3ac0f
Add support for Premount and Postmount commands.
...
We want to allow docker to mount tmpfs directories over existing directories
in the image. We will use this patch to pass commands from docker to
libcontainer. The first command we will use is the tar command to gather
all of the contents of the destination directory before mounting, then after
we mount the post mount command will untar the content.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-04-16 20:34:12 -04:00
52e8fd3958
Merge pull request #526 from ZJU-SEL/nsenter_readme_add
...
Add more explanation for nsenter
2015-04-15 21:02:44 -07:00
689afbcf66
cgroups: add support for devices deny
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-16 08:30:22 +08:00
84f43cdfac
Merge pull request #500 from hqhq/hq_add_set_for_systemd
...
add Set support for systemd based cgroup
2015-04-15 12:23:39 -07:00
317686c673
Add more explanation for nsenter
...
Now the README in nsenter is a little confused
and hard for new commings to understand.
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
2015-04-15 17:27:00 +08:00
32b8465dde
Merge pull request #533 from rhatdan/badrelabel
...
We want to prevent users from accidently attempting to relabel /, /etc and /usr
2015-04-14 13:47:34 -07:00
ed5803ec62
Merge pull request #532 from tifayuki/master
...
check "/sbin/apparmor_parser" in apparmor.IsEnabled()
2015-04-14 13:39:21 -07:00
abd2a921d8
We want to prevent users from accidently attempting to relabel /, /etc and /usr
...
While we know this is by no means complete it at least stops users from
doing a common ignorant action.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-04-14 15:25:43 -04:00
ecb1df0a50
Merge pull request #531 from avagin/test
...
integration: wait all test processes
2015-04-14 10:42:09 -07:00
44c7afad64
also check if "/sbin/apparmor_parser" exists when deciding if apparmor is enabled
...
Signed-off-by: Feng, Honglin <fenghonglin@gmail.com>
2015-04-14 19:18:33 +02:00
fc470e199d
Merge pull request #464 from shishir-a412ed/cpu_shares_issue
...
Throw an error if cgroup tries to set cpu-shares more/less than the maximum/minimum permissible value.
2015-04-14 09:04:31 -07:00
2afcf7c77c
Merge pull request #530 from hqhq/hq_add_nsexec_comment
...
add comments for nsexec.c
2015-04-14 08:17:54 -07:00
d13156f2c6
integration: wait all test processes
...
Otherwise a container cannot be destroyed and we will get an error
in the next case:
go test -v .
=== RUN TestExecPS
--- FAIL: TestExecPS (0.02s)
exec_test.go:43: <nil>: [0] Id already in use: Container with id exists: testCT
Signed-off-by: Andrey Vagin <avagin@openvz.org>
2015-04-14 15:56:35 +03:00
9ce88b829f
add comments for nsexec.c
...
It would be easier for people to understand how nsexec really
works.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-14 13:55:04 +08:00
1f91f6564d
Merge pull request #525 from mrunalp/nsinit_systemd_cgroup
...
nsinit: Add a flag to enable systemd support for cgroups
2015-04-13 12:08:07 -07:00
ec4b6e0bc3
nsinit: Add a flag to enable system support for cgroups
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-04-13 15:01:48 -04:00
b6d8227443
Merge pull request #519 from Mashimiao/add-cgroup-subsystem-hugetlb
...
add cgroup subsystem hugetlb
2015-04-13 10:37:48 -07:00
7d3d32934d
Merge pull request #527 from huikang/master
...
Fix a typo in factory.go
2015-04-12 16:19:54 -07:00
428bd8d96f
Fix a typo in factory.go
...
Docker-DCO-1.1-Signed-off-by: Hui Kang <hkang.sunysb@gmail.com>
2015-04-12 21:26:22 +00:00
dfbea73df4
add cgroup subsystem hugetlb
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-11 09:03:08 +08:00
883cbf7d28
Merge pull request #520 from rhatdan/slave
...
Change mount point propogation to default to slave
2015-04-10 16:55:41 -07:00
ae812bdca7
Merge pull request #524 from adconrad/master
...
Add arch support for ARMv8 and PowerPC, and fix ARMv7
2015-04-10 15:01:28 -07:00
34dba2f7e7
Add support for 32-bit big-endian PowerPC
...
Signed-off-by: Adam Conrad <adconrad@0c3.net>
2015-04-10 12:50:45 -06:00
0e3181a0b0
Fix setns syscall number for ARM, this has been wrong all along.
...
See: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=571503e10045c89af951962ea0bb783482663aad
Signed-off-by: Adam Conrad <adconrad@0c3.net>
2015-04-10 12:49:28 -06:00
38ef9ee346
Add support for ARMv8 (AKA: arm64 or Aarch64)
...
Signed-off-by: Adam Conrad <adconrad@0c3.net>
2015-04-10 12:48:48 -06:00
62e6ac900a
Merge pull request #508 from Mic92/integration-cleanup
...
integration: use test helper for error check
2015-04-10 11:46:26 -07:00
c5fe4369ea
Merge pull request #523 from LK4D4/extra_files_execin
...
Read _LIBCONTAINER_INITPIPE in nsexec.c
2015-04-10 11:41:57 -07:00
8a67ff2b7c
Read _LIBCONTAINER_INITPID in nsexec.c
...
This fixes ExtraFiles for execin
Thanks @Mic95 for report
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-10 11:23:09 -07:00
907c7c17f0
Change mount point propogation to default to slave
...
As an admin I would expect that if I volume mount a partition into a container, and then later add a mount point to the volume, it will show up in the container.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-04-10 10:49:28 -04:00
cc555cce5f
Merge pull request #518 from crosbymichael/memcache
...
Add cache to MemoryStats
2015-04-09 13:57:13 -07:00
2c3949a687
Change memory usage by minus cache memory
...
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Add stats.cache into MemoryStats
add cache to the output then client can clarify the results.
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Do not subtract cache from usage
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-04-09 13:18:46 -07:00
b0fbd0591a
Merge pull request #509 from rhatdan/selinux
...
Add value checking on relabel command for selinux
2015-04-08 23:34:31 -07:00
b271fcfec6
Merge pull request #516 from crosbymichael/additional-fds
...
Append childpipe for adding addtional Fds to container
2015-04-08 15:42:34 -07:00
570eed473b
Move childPipe to the end of FD set
...
This adds a new env var for identifying the internal sync pipe that
libcontainer uses to sync with the container and parent process. This
replaces #496 to allow the user to add additional files to the processes
and not take over fd 3 for all containers.
Closes #496
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-04-08 14:14:51 -07:00
708b25e61e
add option to pass additional fds to container process
...
This can be usefull to implement socket activated containers for example.
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-04-08 13:56:03 -07:00
b120ecf74d
Merge pull request #354 from hqhq/hq_add_blkio_weight_device
...
cgroups: add support for blkio.weight_device
2015-04-08 11:49:05 -07:00
7eaf08c896
Merge pull request #515 from rhatdan/mqueue
...
/dev/mqueue has to be labeled correctly
2015-04-08 11:25:25 -07:00
87ef802709
Merge pull request #501 from ZJU-SEL/nsinit_readme_add
...
Add documentation for nsinit
2015-04-08 11:24:36 -07:00
f7f332bb2c
/dev/mqueue has to be labeled correctly
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-04-08 07:59:40 -04:00
4518bce5bb
Add value checking on relabel command for selinux
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-04-08 07:58:00 -04:00
054d8e02bf
cgroups: add support for blkio.weight_device
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-08 14:11:29 +08:00
521cc35a48
Add documentation for nsinit
...
About how to use and explaination of available options.
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
2015-04-08 09:27:26 +08:00
bd8ec36106
Merge pull request #514 from LK4D4/fix_state_ns
...
Ensure that state always contains pathes to all namespaces
2015-04-07 15:01:09 -07:00
Michael Crosby
Dan Walsh
Ma Shimiao
Qiang Huang
Mrunal Patel
Alexander Morozov
jianbosun
tifayuki
Andrey Vagin
Mrunal Patel
Hui Kang
Adam Conrad
Alexander Morozov
Michael Crosby
Jörg Thalheim
Rohit Jnagal