HuKeping
a4a924e1b6
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-04 21:11:29 +08:00
Antonio Murdaca
4aff563282
Remove unused error return
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-02 15:57:57 +02:00
Tibor Vass
e9c9682333
Merge pull request #12829 from Microsoft/10662-execdriver-driver-refactor
...
Windows: Start refactor execdriver/driver.go
2015-04-30 20:36:10 -04:00
John Howard
10e2dbf375
Windows: Factor out LXC
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-30 14:28:35 -07:00
John Howard
b255c565ca
Windows: Start refactor execdriver/driver.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-30 14:21:04 -07:00
Phil Estes
2c4fe2aba3
Merge pull request #12439 from Mashimiao/add-err-check-before-getting-term
...
Add error check before getting term
2015-04-29 17:57:01 -04:00
Jessica Frazelle
2afcd10202
option to configure cgroups
...
Signed-off-by: Jessica Frazelle <jess@docker.com>
2015-04-27 17:50:39 -07:00
Antonio Murdaca
26543e0309
Replace json.Unmarshal with json.Decoder().Decode()
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-26 15:02:01 +02:00
Daniel, Dao Quang Minh
ade8146aa8
reuse same code for setting pipes in run/exec
...
This also moves `exec -i` test to _unix_test.go because it seems to need a
pty to reliably reproduce the behavior.
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
2015-04-23 21:54:21 +00:00
Daniel, Dao Quang Minh
71b5a754ce
remove unused utils
...
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
2015-04-22 21:53:45 +00:00
Jessie Frazelle
17d5450bc3
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
2015-04-20 17:55:01 -07:00
Lei Jitang
dcc50e1d59
Add support cpu cfs quota
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-20 08:16:47 -07:00
Ma Shimiao
e607bb49c4
clenaup: delete unused function getEnv
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-20 16:32:42 +08:00
Ma Shimiao
73bf9b5c19
add err check before getting term
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-16 17:46:32 +08:00
Michael Crosby
a5f7c4aa31
Ensure state is destroyed on daemont restart
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-04-15 17:44:03 -07:00
Qiang Huang
8077b2fb80
add support for cpuset.mems
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-15 09:33:46 +08:00
Antonio Murdaca
c30a55f14d
Refactor utils/utils, fixes #11923
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-14 01:37:36 +02:00
Michael Crosby
12f7db1830
Merge pull request #12025 from coolljt0725/add_exec_with_user
...
Add docker exec run command as a different user and in privileged mode
2015-04-13 13:50:51 -07:00
Evan Hazlett
05433a4dab
Merge pull request #12275 from LK4D4/pid_host_hell
...
Get process list after PID 1 dead
2015-04-13 14:50:23 -04:00
Eric Windisch
ca37301d54
Link to HTTPS URLs in engine comments
...
Updates most of the instances of HTTP urls in the engine's
comments. Does not account for any use in the code itself,
documentation, contrib, or project files.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-04-11 13:31:34 -04:00
Lei Jitang
72a500e9e5
Add docker exec run a command in privileged mode
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-11 11:26:37 +08:00
Lei Jitang
2cce4791b0
Add `-u|--user` flag to docker exec for running command as a different user
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-11 11:04:24 +08:00
Alexander Morozov
ac8bd12b39
Get process list after PID 1 dead
...
Fix #11087
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-10 16:23:57 -07:00
Brian Goff
6b7e520aa3
Merge pull request #12215 from ahmetalpbalkan/execdriver/localrand
...
execdriver/lxc: use local rand.Random in test
2015-04-09 12:22:25 -04:00
Yan Feng
ab11d60555
Fix a typo in docker/daemon/execdriver/native/exec.go
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
2015-04-09 11:46:09 -04:00
Ahmet Alp Balkan
c2c45d7769
execdriver/lxc: use local rand.Random in test
...
Preventing the test execution to pollute the deterministic runtime environment
by seeding the global rand.Random.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-08 18:13:07 -07:00
Mrunal Patel
195bebd3a7
Removes unused function.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-04-07 18:15:28 -04:00
guoxiuyan
ffcc4a1e52
Fix a minor typo
...
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com>
2015-04-04 15:36:35 +08:00
Michael Crosby
7061a993c5
Return closed channel if oom notification fails
...
When working with Go channels you must not set it to nil or else the
channel will block forever. It will not panic reading from a nil chan
but it blocks. The correct way to do this is to create the channel then
close it as the correct results to the caller will be returned.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-04-01 15:30:48 -07:00
Jessie Frazelle
f0ddbbaa86
Merge pull request #11933 from LK4D4/fix_err_mask
...
Various fixes for execdriver
2015-03-30 17:12:35 -07:00
Alexander Morozov
f468bbb7e8
Do not mask *exec.ExitError
...
Fix #11764
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-30 15:31:49 -07:00
Antonio Murdaca
cc46ae8eae
Remove duplicate assignment
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-30 23:07:43 +02:00
Alexander Morozov
5a1e5cf8c9
Get child processes before main process die
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-30 13:28:34 -07:00
Alexander Morozov
489ab77f4a
Use proper wait function for --pid=host
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-30 13:27:38 -07:00
Antonio Murdaca
6f4d847046
Replace aliased imports of logrus, fixes #11762
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-26 23:22:04 +01:00
Jessica Frazelle
7dce902494
Get rid of panic in stats for lxc
...
Fix containers dir
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
2015-03-24 21:12:06 -07:00
Jessie Frazelle
22dba32b4d
Merge pull request #10527 from mfojtik/lxc_11
...
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
2015-03-24 17:37:27 -07:00
Michael Crosby
246cab90f2
Mkdir for lxc root dir before setup of symlink
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-24 15:53:23 -07:00
Michael Crosby
f3fc857e01
Merge pull request #11716 from LK4D4/root_in_run
...
Use /var/run/docker as root for execdriver
2015-03-24 14:58:30 -07:00
Alexander Morozov
1e788ec985
Use /var/run/docker as root for execdriver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-24 10:47:30 -07:00
Dan Walsh
fe9fe1473c
We want to allow the sharing of /dev from the host into the
...
container.
docker run -v /dev:/dev should stop mounting other default mounts in i
libcontainer otherwise directories and devices like /dev/ptx get mishandled.
We want to be able to run libvirtd for launching vms and it needs
access to the hosts /dev. This is a key componant of OpenStack.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-03-20 08:56:21 -04:00
Jessie Frazelle
5a239c0022
Merge pull request #11507 from crosbymichael/container-state
...
Cleanup libcontainer container state
2015-03-19 16:02:24 -07:00
Michael Crosby
455a272aef
Merge pull request #11428 from vishh/parent-cgroup
...
Adding '--cgroup-parent' option.
2015-03-19 14:41:57 -07:00
Michael Crosby
2b12b099b8
Mount libcontainer state dir in tmpfs
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-19 14:27:17 -07:00
Michael Crosby
06c939e527
Ensure the container state is removed on daemon boot
...
This ensures that the libcontainer state is fully removed for a
container after it is terminated.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-19 14:21:19 -07:00
Mrunal Patel
60ef4ae6fc
Update libcontainer to 4a72e540feb67091156b907c4700e580a99f5a9d
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-03-19 14:42:23 -04:00
Michal Fojtik
d62f25e422
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
...
Signed-off-by: Michal Fojtik <mfojtik@redhat.com>
2015-03-19 14:51:05 +01:00
Vishnu Kannan
0b1e2b5a55
Adding '--cgroup-parent' flag to docker run. This feature helps users implement more complex
...
resource isolation policies on top of what native docker provides.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-19 02:34:15 +00:00
Michael Crosby
f4a458e67f
Do not mask /proc/kcore in privileged
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-18 14:17:21 -07:00
Michael Crosby
f5a154f2d2
Don't hardcode default rlimit
...
The default for rlimit handling should be to inherit the rlimit of the
daemon unless explicitly set.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-17 16:04:15 -07:00