jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,550 Commits 5 Branches 25 Tags 17 MiB
Commit Graph

1550 Commits

Author SHA1 Message Date
Alexander Morozov fc31076c23 Substract source mount from cgroup dir 
This is needed because for nested containers cgroups. Without this patch
they creating unnecessary intermediate cgroup like:
/sys/fs/cgroup/memory/system.slice/docker-9409d9f0b68fb9e9d7d532d5b3f35e7c7f9cca1312af392ae3b28436f1f2998f.scope/system.slice/docker-9409d9f0b68fb9e9d7d532d5b3f35e7c7f9cca1312af392ae3b28436f1f2998f.scope/docker/908ebcc9c13584a14322ec070bd971e0de62f126c0cd95c079acdb99990ad3a3

It is because in /proc/self/cgroup we see paths from host, and they don't
exist in container.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-17 11:41:58 -07:00
Mrunal Patel 2598484b97 Merge pull request #130 from LK4D4/cgroups_mount_fix 
Cgroups mount fix
 2015-07-16 10:49:13 -07:00
Mrunal Patel 48ac2222e5 Merge pull request #131 from LK4D4/name_cgroup 
Fix handling name= cgroups
 2015-07-15 14:43:09 -07:00
Alexander Morozov e289cf734b Fix handling name= cgroups 
Before name=systemd cgroup was mounted inside container to
/sys/fs/cgroup/name=systemd, which is wrong, it should be
/sys/fs/cgroup/systemd

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-15 13:58:17 -07:00
Alexander Morozov f6eb19c0d5 Tests for mounting cgroups 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-15 11:07:03 -07:00
Alexander Morozov 40b9b89107 Substract bindmount path from cgroup dir 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-15 10:41:25 -07:00
Mrunal Patel 42aa891a6b Merge pull request #91 from hqhq/hq_add_cgroup_mount 
Add cgroup mount in the recommended config
 2015-07-15 09:51:24 -07:00
Mrunal Patel da0f867bf7 Merge pull request #117 from jhjeong-kr/master 
Fixed two typos
 2015-07-15 08:27:52 -07:00
Mrunal Patel cc341952ac Merge pull request #120 from lizf-os/support-memory-swappines-v2 
Add memory swappiness support
 2015-07-15 08:25:22 -07:00
Alexander Morozov 0d948945b0 Merge pull request #127 from hqhq/hq_fix_tmpfs_mount 
Correct tmpfs mount for cgroup
 2015-07-14 22:11:52 -07:00
Qiang Huang d7181a73e4 Add cgroup mount in the recommended config 
And allow cgroup mount take flags from user configs.
As we show ro in the recommendation, so hard-coded
read-only flag should be removed.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-15 09:31:39 +08:00
Jin-Hwan Jeong 094a83b25e in signals.go: depeding -> depending 
in tty.go: pty -> tty

Signed-off-by: Jin-Hwan Jeong <jhjeong.kr@gmail.com>
 2015-07-15 10:11:24 +09:00
Qiang Huang 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
Zefan Li 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
Alexander Morozov 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
Qiang Huang 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
Mrunal Patel 0d12ac20c7 Merge pull request #116 from jhjeong-kr/master 
typo: exists -> exits
 2015-07-10 16:42:26 -07:00
Jin-Hwan Jeong 628af083f8 typo: exists -> exits 
Signed-off-by: Jin-Hwan Jeong <jhjeong.kr@gmail.com>
 2015-07-11 08:19:18 +09:00
Mrunal Patel 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
Michael Crosby 3c403a265e Merge pull request #98 from wking/clarify-idmapping-fields 
Fix IDMapping host / container field confusion
 2015-07-10 14:08:00 -07:00
Michael Crosby 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
root 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
Mrunal Patel 53f5649501 Merge pull request #111 from jhjeong-kr/impr 
typo: SICHLD -> SIGCHLD
 2015-07-09 21:06:52 -07:00
Qiang Huang 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
Jin-Hwan Jeong cd60ad988a typo: SICHLD -> SIGCHLD 
Signed-off-by: Jin-Hwan Jeong <jhjeong.kr@gmail.com>
 2015-07-10 11:17:54 +09:00
Michael Crosby a88b26d3ac Merge pull request #109 from mrunalp/fix_tests 
Remove deserialization tests.
 2015-07-09 16:17:25 -07:00
Mrunal Patel 503adf586f Remove deserialization tests. 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-07-09 18:46:13 -04:00
Michael Crosby e9c0535f3c Merge pull request #52 from jhowardmsft/remove-seccomp 
Windows: Factor out seccomp
 2015-07-09 11:50:41 -07:00
Michael Crosby e224e2c468 Merge pull request #53 from jhowardmsft/CloseExecFrom 
Windows: Factor out CloseExecFrom
 2015-07-09 11:50:07 -07:00
Michael Crosby 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
Jessie Frazelle 1c43a7759a Merge pull request #72 from LK4D4/ci 
CI target for Makefile
 2015-07-09 11:17:46 -07:00
Alexander Morozov adc6564042 Move test_Dockerfile to script dir 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-09 06:19:26 -07:00
Alexander Morozov 48ddedba65 Add ci target 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-09 06:19:26 -07:00
Michael Crosby 03bf234233 Merge pull request #103 from jfrazelle/fix-criu-version 
fix dockerfile
 2015-07-08 16:55:23 -07:00
Jessica Frazelle 97cd4ea466 fix dockerfile 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-08 16:34:30 -07:00
W. Trevor King 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
W. Trevor King 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
Mrunal Patel 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
Mrunal Patel 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
zenlin 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
Jin-Hwan Jeong cbee9e5050 wrong grammar: should never been --> should have never been 2015-07-08 16:55:23 +09:00
Qiang Huang 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
Michael Crosby 48182db8cc Merge pull request #90 from hqhq/hq_add_memory_limit 
Add memory limit set
 2015-07-07 11:30:24 -07:00
Michael Crosby 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
Michael Crosby f7431f1f66 Merge pull request #73 from mrunalp/sysctl 
Adds Sysctl support
 2015-07-07 09:33:44 -07:00
Mrunal Patel 8a7d3bda6f Merge pull request #89 from hqhq/hq_add_sample_config 
Remove sample configs from libcontainer
 2015-07-07 09:24:51 -07:00
Rajasekaran e027c57f38 Fixing test step for memory swappiness 
Signed-off-by: Rajasekaran <rajasec79@gmail.com>
 2015-07-07 21:15:59 +05:30
Qiang Huang 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
Qiang Huang 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
Mrunal Patel 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