b1fd78346e
Correct tmpfs mount for cgroup
...
Fixes: https://github.com/docker/docker/issues/14543
Fixes: https://github.com/docker/docker/pull/14610
Before this, we got mount info in container:
```
sysfs /sys sysfs ro,seclabel,nosuid,nodev,noexec,relatime 0 0
/sys/fs/cgroup tmpfs rw,seclabel,nosuid,nodev,noexec,relatime 0 0
cgroup /sys/fs/cgroup/cpuset cgroup rw,relatime,cpuset 0 0
```
It has no mount source, so in `parseInfoFile` in Docker code,
we'll get:
```
Error found less than 3 fields post '-' in "84 83 0:41 / /sys/fs/cgroup rw,nosuid,nodev,noexec,relatime - tmpfs rw,seclabel"
```
After this fix, we have mount info corrected:
```
sysfs /sys sysfs ro,seclabel,nosuid,nodev,noexec,relatime 0 0
tmpfs /sys/fs/cgroup tmpfs rw,seclabel,nosuid,nodev,noexec,relatime 0 0
cgroup /sys/fs/cgroup/cpuset cgroup rw,relatime,cpuset 0 0
```
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-15 09:09:09 +08:00
6bd71ad6a4
Add memory swappiness support
...
- Initialize swappiness to -1 for the default config.json
- Pass swappiness from config.json to libcontainer config
Signed-off-by: Zefan Li <lizefan@huawei.com>
2015-07-14 10:43:43 +08:00
31f23e4429
Merge pull request #118 from hqhq/hq_fix_memory_cgroup
...
Fix error when memory cgroup not mounted
2015-07-13 11:23:08 -06:00
4e244108ef
Fix error when memory cgroup not mounted
...
Fixes : #57
Normally all cgroup subsystems are optional except device cgroup,
but memory cgroup optional was broken by:
https://github.com/docker/libcontainer/pull/637
This patch fixes this.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-13 18:22:35 +08:00
0d12ac20c7
Merge pull request #116 from jhjeong-kr/master
...
typo: exists -> exits
2015-07-10 16:42:26 -07:00
628af083f8
typo: exists -> exits
...
Signed-off-by: Jin-Hwan Jeong <jhjeong.kr@gmail.com>
2015-07-11 08:19:18 +09:00
d72967657c
Merge pull request #115 from brahmaroutu/ppc64le_datatype
...
the data type should be int8 for ppc64le
2015-07-10 14:23:59 -07:00
3c403a265e
Merge pull request #98 from wking/clarify-idmapping-fields
...
Fix IDMapping host / container field confusion
2015-07-10 14:08:00 -07:00
a80e2961dc
Merge pull request #112 from hqhq/hq_sort_mount_options
...
Sort mount flags so it's easier to be found
2015-07-10 13:58:04 -07:00
b5412d1b59
the data type should be int8 for ppc64le
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-10 20:11:11 +00:00
23e3887e05
avoid infinite loop with GCCGO
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-10 19:15:26 +00:00
53f5649501
Merge pull request #111 from jhjeong-kr/impr
...
typo: SICHLD -> SIGCHLD
2015-07-09 21:06:52 -07:00
0b2fb3edb5
Sort mount flags so it's easier to be found
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-10 10:31:20 +08:00
cd60ad988a
typo: SICHLD -> SIGCHLD
...
Signed-off-by: Jin-Hwan Jeong <jhjeong.kr@gmail.com>
2015-07-10 11:17:54 +09:00
a88b26d3ac
Merge pull request #109 from mrunalp/fix_tests
...
Remove deserialization tests.
2015-07-09 16:17:25 -07:00
503adf586f
Remove deserialization tests.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-07-09 18:46:13 -04:00
e9c0535f3c
Merge pull request #52 from jhowardmsft/remove-seccomp
...
Windows: Factor out seccomp
2015-07-09 11:50:41 -07:00
e224e2c468
Merge pull request #53 from jhowardmsft/CloseExecFrom
...
Windows: Factor out CloseExecFrom
2015-07-09 11:50:07 -07:00
e34c9c7324
Merge pull request #100 from zenlinTechnofreak/master
...
Fix bug in Readme.md,change GOPATH to GOPATH/src
2015-07-09 11:47:33 -07:00
1c43a7759a
Merge pull request #72 from LK4D4/ci
...
CI target for Makefile
2015-07-09 11:17:46 -07:00
adc6564042
Move test_Dockerfile to script dir
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-09 06:19:26 -07:00
48ddedba65
Add ci target
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-09 06:19:26 -07:00
03bf234233
Merge pull request #103 from jfrazelle/fix-criu-version
...
fix dockerfile
2015-07-08 16:55:23 -07:00
97cd4ea466
fix dockerfile
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-08 16:34:30 -07:00
41979ca62c
spec.go: Adjust to new IDMapping field names
...
This fixes a bug where IDMapping.From was mapped to IDMap.ContainerID
and IDMapping.To was mapped to IDMap.HostID, while the old spec docs
were:
// From is the uid/gid of the host user or group.
From int32 `json:"from"`
// To is the uid/gid of the container's user or group.
To int32 `json:"to"`
The new IDMapping field names make the expected mapping more obvious
(HostID -> HostID and ContainerID -> ContainerID ;).
2015-07-08 10:53:06 -07:00
40ca795938
Godeps: Update github.com/opencontainers/specs to include IDMapping change
...
Pull in:
* spec_linux.go: Rename IDMapping fields to follow syscall.SysProcIDMap
* Merge pull request opencontainers/specs#60 from jonboulle/master
2015-07-08 10:53:06 -07:00
bb2062b9bf
Merge pull request #99 from jhjeong-kr/master
...
wrong grammar: should never been --> should have never been
2015-07-08 09:42:29 -07:00
6c88b305de
Merge pull request #97 from hqhq/hq_add_oom_kill_disable
...
Add oom-kill-disable support for systemd
2015-07-08 09:40:08 -07:00
cb561f54f2
Fix bug in Readme.md,change GOPATH to GOPATH/src
...
to avoid missunderstanding of how to build.
Signed-off-by: zenlin <linzhinan@huawei.com>
2015-07-08 19:10:22 +08:00
cbee9e5050
wrong grammar: should never been --> should have never been
2015-07-08 16:55:23 +09:00
b4d1df0131
Add oom-kill-disable support for systemd
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-08 09:21:46 +08:00
48182db8cc
Merge pull request #90 from hqhq/hq_add_memory_limit
...
Add memory limit set
2015-07-07 11:30:24 -07:00
a7a7263b4c
Merge pull request #95 from rajasec/runc_teststepissue
...
Fixing memory swappiness as -1 in template file for older kernels
2015-07-07 11:08:16 -07:00
f7431f1f66
Merge pull request #73 from mrunalp/sysctl
...
Adds Sysctl support
2015-07-07 09:33:44 -07:00
8a7d3bda6f
Merge pull request #89 from hqhq/hq_add_sample_config
...
Remove sample configs from libcontainer
2015-07-07 09:24:51 -07:00
e027c57f38
Fixing test step for memory swappiness
...
Signed-off-by: Rajasekaran <rajasec79@gmail.com>
2015-07-07 21:15:59 +05:30
2539d53896
Add memory limit set
...
Don't know why we missed that.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-07 09:20:51 +08:00
18a2ca3758
Remove sample configs from libcontainer
...
They are for nsinit, and is no longer used.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-07 07:41:19 +08:00
8ea6c65d12
Rename SystemProperties to Sysctl and make it available in the runc config
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-07-06 19:18:08 -04:00
d61480ea3d
Update github.com/opencontainer/specs to include Sysctl change
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-07-06 19:16:55 -04:00
5ec11a2918
Merge pull request #86 from ktraghavendra/85_container_swappiness
...
Treat -1 as default value for memory swappiness
2015-07-06 10:12:22 -07:00
8c6ab85323
Merge pull request #82 from crosbymichael/spec-updates-jul1
...
Update runc with types from spec repository
2015-07-03 17:34:55 -07:00
88104a4444
Treat -1 as default value for memory swappiness.
...
In some older kernels setting swappiness fails. This happens even
when nobody tries to configure swappiness from docker UI because
we would still get some default value from host config.
With this we treat -1 value as default value (set implicitly) and skip
the enforcement of swappiness.
However from the docker UI setting an invalid value anything other than
0-100 including -1 should fail. This patch enables that fix in docker UI.
without this fix container creation with invalid value succeeds with a
default value (60) which in incorrect.
Signed-off-by: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
2015-07-03 18:19:45 +05:30
e2df818399
Add opencontainers/spec to godeps
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-07-02 14:00:13 -07:00
845fc65e54
Create linux spec for runc spec command
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-07-02 13:45:56 -07:00
f4c35e70d1
Depend on Spec types from specs repository
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-07-02 13:45:27 -07:00
d8af59822b
Remove spec types from runc
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-07-02 13:45:27 -07:00
e15b86edb9
Add user struct based on spec implementation.
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-07-02 13:45:27 -07:00
1865c0aac6
Remove apparmor profile generation from libcontainer
...
The creation of the profile should be handled outside of libcontainer so
that it can be customized and packaged.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-07-02 13:45:27 -07:00
00f6b56903
Merge pull request #79 from LK4D4/fix_tags
...
Fix build tags
2015-07-01 13:57:50 -07:00
Qiang Huang
Zefan Li
Alexander Morozov
Mrunal Patel
Jin-Hwan Jeong
Michael Crosby
root
Mrunal Patel
Jessie Frazelle
Alexander Morozov
Jessica Frazelle
W. Trevor King
zenlin
Rajasekaran
Raghavendra K T