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
fd0087d3ac
Merge pull request #474 from crosbymichael/revert-cgroups-change
...
Revert "cgroups: only return path when subsystem really mounted
2015-03-23 14:09:04 -07:00
c5eef90460
Add back check for mountpoint to return consistent error
...
Adding this check here allows a nice error displaying that the specified
cgroup subsystem is not mounted.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-23 13:32:00 -07:00
fc3981ea5c
Revert "cgroups: only return path when subsystem really mounted"
...
This reverts commit 606d9064b0
2015-03-23 13:31:42 -07:00
f8daab8a96
Merge pull request #472 from crosbymichael/fix-cgroup-error-handling
...
path now returns the IsNotFound error
2015-03-23 11:40:39 -07:00
c099a20eb8
path now returns the IsNotFound error
...
This error is not propogated up to the caller and needs to be handled at
the site where d.path() is called.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-23 11:32:09 -07:00
5c6332687d
Merge pull request #469 from Snorch/systemd-check-property-defaultdependencies
...
systemd: properly check DefaultDependencies is read only
2015-03-23 10:43:31 -07:00
dc4bd4cece
systemd: properly check DefaultDependencies is read only
...
on systemd v208 in Centos7 and Fedora20 error is not:
"org.freedesktop.DBus.Error.PropertyReadOnly"
but:
"property.org.freedesktop.DBus.Error.PropertyReadOnly"
so check failes and in Docker we get:
Docker daemon: System error: Cannot set property DefaultDependencies, or
unknown property
Fix for commit:
99233fde8c
2015-03-23 09:44:15 +03:00
b6cf7a6c85
Merge pull request #460 from sunyuan3/l1
...
correct comment errors for netlink_linux.go
2015-03-20 08:16:38 -07:00
4fdec5a8e1
correct comment errors for netlink_linux.go
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-03-20 07:55:11 +08:00
4a72e540fe
Merge pull request #459 from LK4D4/tmpfs_root
...
Add TmpfsRoot option
2015-03-19 11:31:11 -07:00
870119e763
Add TmpfsRoot option
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-19 11:05:59 -07:00
14a7d2f468
Merge pull request #455 from mrunalp/remove_base_mounts
...
mount: Take out the base mounts and move them to the config.
2015-03-19 11:03:01 -07:00
4622c8ac95
Merge pull request #441 from hqhq/hq_change_set_api
...
add parameter to Set api
2015-03-18 10:56:20 -07:00
bc1d229dbe
Update test.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-03-17 14:09:33 -04:00
c1ca18404f
mount: Take out the base mounts and move them to the config.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-03-17 14:03:28 -04:00
52a8c004ca
Merge pull request #453 from vishh/parent_cgroup
...
Do not fail cgroups setup if parent cgroup does not exist.
2015-03-16 15:00:59 -07:00
9bebc66042
Do not fail cgroups setup if parent cgroup does not exist.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-16 21:09:37 +00:00
0596e6384a
Merge pull request #451 from mrunalp/mounts_fix
...
mount: sysfs also doesn't need to be labelled like mqueue.
2015-03-16 11:29:14 -07:00
3125b53b1a
mount: sysfs also doesn't need to be labelled like mqueue.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-03-16 14:05:20 -04:00
71a57166c1
Merge pull request #450 from avagin/dind
...
Fix path to /dind
2015-03-16 09:53:11 -07:00
6922824833
Fix path to /dind
...
That script was moved a few days ago
https://github.com/docker/docker/pull/11373
Signed-off-by: Andrew Vagin <avagin@openvz.org>
2015-03-16 19:45:18 +03:00
000d36e109
Merge pull request #443 from mrunalp/getfilecon_fix
...
selinux: Adds a check for a NUL byte at the end of the string and removes it
2015-03-13 11:45:27 -07:00
aaca2848a1
Merge pull request #430 from LK4D4/vet_checks
...
Add vet checks to validate script
2015-03-13 11:40:54 -07:00
5d6c507d7c
Merge pull request #449 from estesp/update-busybox-tar
...
Update to recent busybox 2014.11 tar
2015-03-12 15:03:41 -07:00
ad3d14f1da
Update to recent busybox 2014.11 tar
...
Move up to the latest busybox tarball that has the fix for `ip` command
segfault.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-03-12 17:54:43 -04:00
d658fb8a25
Merge pull request #448 from crosbymichael/nsinit-usability
...
nsinit usability improvements
2015-03-12 12:05:15 -07:00
Ma Shimiao
Mrunal Patel
Michael Crosby
Alexander Morozov
wonderflow
Daniel, Dao Quang Minh
Brandon Philips
Mrunal Patel
Alexander Morozov
Lei Jitang
Qiang Huang
Michael Crosby
Victor Marmol
Pavel Tikhomirov
Yuan Sun
Vishnu Kannan
Andrew Vagin
Phil Estes