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
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
cbc8dee085
Ensure that state always contains pathes to all namespaces
...
Thanks coolljit0725 for initial fix.
Closes #512
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-07 14:50:08 -07:00
6012d1056d
Merge pull request #502 from hqhq/hq_fix_systemd_freeze
...
bugfix and cleanup for systemd cgroup
2015-04-06 09:22:41 -07:00
9a25d3000c
Merge pull request #505 from hqhq/hq_add_systemd_test
...
add systemd integration test
2015-04-03 12:58:43 -07:00
346236be68
Merge pull request #507 from crosbymichael/nsinit-root
...
Change nsinit root to /var/run/nsinit
2015-04-03 10:50:32 -07:00
bce9e0f63c
Merge pull request #490 from dqminh/make-binary
...
add binary target to direct install in a container
2015-04-03 10:50:10 -07:00
fa9efe82f9
Change nsinit root to /var/run/nsinit
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-04-03 10:45:01 -07:00
c502c7322a
add systemd integration test
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-03 13:17:22 +08:00
d00b836985
Merge pull request #504 from crosbymichael/pid1-fixes
...
Fix pdeathsig and ppid for supervisor running as pid1
2015-04-02 14:09:47 -07:00
46132cebcf
Fix pdeathsig and ppid for supervisor running as pid1
...
For some reason when the supervisor of a container is PID1 the parent
death signal was being delivered to the container's init process even if
it did not die. Also the ppid() will return 1 for a container running
in the pid namespace of it's parent and the parent is pid1.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-04-02 13:55:55 -07:00
c22ac4876f
Merge pull request #498 from athoune/typo
...
Fix: typos.
2015-04-02 13:50:04 -07:00
ee1000e153
Fix: typos.
...
Docker-DCO-1.1-Signed-off-by: Mathieu Lecarme <mathieu@garambrogne.net> (github: athoune)
2015-04-02 22:41:41 +02:00
f9a0d21fab
cleanup for systemd cgroup
...
Add join function so we can reduce duplicate code, and we can
call Set api in fs cgroup, that can reduce sync work on fs side
and systemd side.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-02 11:00:35 +08:00
4c2886d59a
don't change state if systemd freeze failed
...
It has been fixed in fs base cgroup, but missed in systemd based.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-02 10:22:38 +08:00
b89112c542
Merge pull request #493 from hqhq/hq_fix_nsinit_doc
...
fix README.md for nsinit
2015-04-01 10:47:44 -07:00
397b675315
Merge pull request #497 from Mashimiao/use-unified-subsystems
...
cgroups/systemd: Use unified subsystems
2015-03-31 23:06:54 -07:00
c06f92353f
fix README.md for nsinit
...
Cut the long lines and add `--config` to the `nsinit exec` command.
And some grammar fix.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-01 13:50:48 +08:00
8961fd20e6
cgroups/systemd: Use unified subsystems
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-01 12:04:54 +08:00
1a246dd543
Merge pull request #494 from Mashimiao/return-clear-freezer-error
...
cgroups: reurn error when passing invalid argument to freezer
2015-03-31 12:59:01 -07:00
0eb8a1aac3
cgroups: reurn error when passing invalid argument to freezer
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-01 00:04:33 +08:00
c851275416
Merge pull request #489 from philips/stop-test-unit
...
cgroups: systemd: attempt to stop test scope, if any
2015-03-30 17:55:21 -05:00
1f176f3c0d
Merge pull request #491 from LK4D4/fix_parent_find
...
Fix finding parent for fs cgroups
2015-03-30 15:29:37 -07:00
dc82e30089
Fix finding parent for fs cgroups
...
It was just supposed, that parent always like /root/subsystem, but it
can be /root/subsystem1,subsystem2
Fixes docker/docker#10690
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-30 14:12:15 -07:00
562cd20d05
Merge pull request #488 from ZJU-SEL/add_nsinit_readme
...
add readme for nsinit about how to build nsinit
2015-03-30 10:40:44 -07:00
3b95acdfa1
Add readme for nsinit about how to build nsinit
...
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
2015-03-30 13:37:26 +08:00
c4a8de8de0
add binary target to direct install in a container
...
This add `make binary` to perform direct install libcontainer binaries inside
dockercore/libcontainer container instead of having to install dependencies and
run `make direct-install` on the host.
The `nsinit` binary will be placed into `bundles/nsinit`, and we ignore the
bundles directory from git.
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
2015-03-28 08:14:22 +00:00
af371eae76
Merge pull request #487 from LK4D4/not_mask_esrch
...
Use syscall.Kill instead of p.cmd.Process.Kill
2015-03-27 10:53:29 -07:00
ee102305fb
Use syscall.Kill instead of p.cmd.Process.Kill
...
We need this to unmask syscall.ESRCH error, which handled in docker and
can be handled by other clients.
Closes #457
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-27 10:50:32 -07:00
dc4c502efd
Merge pull request #484 from mrunalp/process_caps
...
Process capabilities
2015-03-26 10:10:47 -07:00
9e787db1b1
cgroups: systemd: attempt to stop test scope, if any
...
As reported in #477 the test scope may not be cleaned up between runs.
In order to fix this we must be polite and remove the scope after we
have done our test and attempt to remove an existing scope if it exists.
This way we can guarantee our test will run.
Signed-off-by: Brandon Philips <brandon.philips@coreos.com>
2015-03-25 18:15:35 -04:00
3cd416efe1
Add a test for Process Capabilities.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-03-25 15:41:09 -04:00
ca73d7aede
Pass down process Capabilities and apply them if present.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-03-25 15:40:32 -04:00
d284fdfaa3
Add Capabilities field to process.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-03-25 15:39:34 -04:00
a6044b701c
Merge pull request #481 from coolljt0725/fix_typo_in_init_linux
...
Fix minor typo in init_linux.go
2015-03-25 08:51:20 -07:00
a4f2e1e187
Fix minor typo in init_linux.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-25 14:58:22 +08:00
8530167f7f
Merge pull request #480 from mrunalp/device_mount
...
mount: Add a flag to bind devices when user namespaces are enabled.
2015-03-24 17:43:55 -07:00
2c037b7fd9
mount: Add a flag to bind devices when user namespaces are enabled.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-03-24 20:34:14 -04:00
37d229d026
Merge pull request #475 from hqhq/hq_remove_redundant_code
...
remove redundant code
2015-03-24 11:36:42 -07:00
bfa67ab988
Merge pull request #478 from LK4D4/update_caps
...
Update syndtr/gocapability to 8e4cdcb3c22b40d5e330ade0b68cb2e2a3cf6f98
2015-03-24 10:23:12 -07:00
451043367b
Update syndtr/gocapability to 8e4cdcb3c22b40d5e330ade0b68cb2e2a3cf6f98
...
It includes fix for RHEL6 which has no cap_last.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-24 08:53:28 -07:00
7766c1e07b
remove redundant code
...
Now we return not found err in path(), so no need to check again.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-24 09:19:40 +08:00
Alexander Morozov
Michael Crosby
Jörg Thalheim
Rohit Jnagal
Mrunal Patel
Dan Walsh
Qiang Huang
wonderflow
Alexander Morozov
Michael Crosby
Mathieu Lecarme
Ma Shimiao
Daniel, Dao Quang Minh
Brandon Philips
Mrunal Patel
Lei Jitang