ad3d66108b
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: a4a924e1b6c50f0f02460489259d73468a6c282e
Component: engine
2015-05-04 21:11:29 +08:00
809dae68ab
Remove unused error return
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 4aff563282c4d467575aed006642a22d673d4cb7
Component: engine
2015-05-02 15:57:57 +02:00
bdf088b5fb
Merge pull request #12829 from Microsoft/10662-execdriver-driver-refactor
...
Windows: Start refactor execdriver/driver.go
Upstream-commit: e9c9682333499f6a063404ad9df5db1385e75bbf
Component: engine
2015-04-30 20:36:10 -04:00
74df4d944e
Windows: Factor out LXC
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 10e2dbf375b1aebe33bce0646a3a95d34c48d4f8
Component: engine
2015-04-30 14:28:35 -07:00
17b585ec32
Windows: Start refactor execdriver/driver.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b255c565ca66b778e87ccf1f8d46963feaee94a0
Component: engine
2015-04-30 14:21:04 -07:00
99358033cc
Merge pull request #12439 from Mashimiao/add-err-check-before-getting-term
...
Add error check before getting term
Upstream-commit: 2c4fe2aba3adc4416d09e76e669341e2217ae894
Component: engine
2015-04-29 17:57:01 -04:00
1a116000d5
option to configure cgroups
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
Upstream-commit: 2afcd10202283478cbafb21e8c5f90f1236acccc
Component: engine
2015-04-27 17:50:39 -07:00
e5f7f8da6f
Replace json.Unmarshal with json.Decoder().Decode()
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 26543e03095eaa45d9afc12c029f07539323fee5
Component: engine
2015-04-26 15:02:01 +02:00
0bd2f00743
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 >
Upstream-commit: ade8146aa82baa88bacdcf2d9c2559e8f47d71e4
Component: engine
2015-04-23 21:54:21 +00:00
925bb7aac9
remove unused utils
...
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
Upstream-commit: 71b5a754cec09b2f1bcef986bdd6fd109451b8f2
Component: engine
2015-04-22 21:53:45 +00:00
cff18dc122
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
Upstream-commit: 17d5450bc31e81c22e8ccba806294e4d744af275
Component: engine
2015-04-20 17:55:01 -07:00
f8f4bcdb38
Add support cpu cfs quota
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: dcc50e1d593fd7995189872791c6d7a013f16970
Component: engine
2015-04-20 08:16:47 -07:00
8b9e25d786
clenaup: delete unused function getEnv
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: e607bb49c48e0478b07fceb640d3e765151050e4
Component: engine
2015-04-20 16:32:42 +08:00
8412ee62f9
add err check before getting term
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 73bf9b5c195170b3d71f86b285ac12e50d26ef51
Component: engine
2015-04-16 17:46:32 +08:00
d0cae5a6bf
Ensure state is destroyed on daemont restart
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: a5f7c4aa31fa1ee2a3bebf4d38f5fda7a4a28a0d
Component: engine
2015-04-15 17:44:03 -07:00
4f6ebaa34e
add support for cpuset.mems
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 8077b2fb805c78cee642d8350df88227c6414960
Component: engine
2015-04-15 09:33:46 +08:00
a4111cba55
Refactor utils/utils, fixes #11923
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c30a55f14dbbe3971ba0ac716ba69a60868f4490
Component: engine
2015-04-14 01:37:36 +02:00
6165959ea5
Merge pull request #12025 from coolljt0725/add_exec_with_user
...
Add docker exec run command as a different user and in privileged mode
Upstream-commit: 12f7db18309950785e873119edb03e0a1621e7a3
Component: engine
2015-04-13 13:50:51 -07:00
e120033d69
Merge pull request #12275 from LK4D4/pid_host_hell
...
Get process list after PID 1 dead
Upstream-commit: 05433a4dabeb7204d6925606549ba79022f506d6
Component: engine
2015-04-13 14:50:23 -04:00
0551904b7c
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 >
Upstream-commit: ca37301d54e1525d4522dea266180072d4fd892b
Component: engine
2015-04-11 13:31:34 -04:00
aaaa676179
Add docker exec run a command in privileged mode
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 72a500e9e5929b038816d8bd18d462a19e571c99
Component: engine
2015-04-11 11:26:37 +08:00
d1f2626097
Add -u|--user flag to docker exec for running command as a different user
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2cce4791b0e75201cb65daad07d4203d1c4c2996
Component: engine
2015-04-11 11:04:24 +08:00
5dd956e210
Get process list after PID 1 dead
...
Fix #11087
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ac8bd12b39d39a9361adc174bdff7837e771460d
Component: engine
2015-04-10 16:23:57 -07:00
66b2b6199d
Merge pull request #12215 from ahmetalpbalkan/execdriver/localrand
...
execdriver/lxc: use local rand.Random in test
Upstream-commit: 6b7e520aa3effadc7a08cd82bcff29a4a53f580c
Component: engine
2015-04-09 12:22:25 -04:00
5ee2e5422a
Fix a typo in docker/daemon/execdriver/native/exec.go
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
Upstream-commit: ab11d605556749e56e9dc5b4b071375765ad60bf
Component: engine
2015-04-09 11:46:09 -04:00
0e9f46311c
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 >
Upstream-commit: c2c45d77691d1ca501a68d20885d040415477c92
Component: engine
2015-04-08 18:13:07 -07:00
4f7e8c1d9e
Removes unused function.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 195bebd3a7b6ffab1cfbb15ad9835ad83bca9737
Component: engine
2015-04-07 18:15:28 -04:00
7919b8b131
Fix a minor typo
...
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com >
Upstream-commit: ffcc4a1e52def3b1552ae3c7ba4ee1fb47f92cea
Component: engine
2015-04-04 15:36:35 +08:00
aeb6266db3
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 >
Upstream-commit: 7061a993c5b620d6e68450f1b90f3458bfa1add0
Component: engine
2015-04-01 15:30:48 -07:00
154ea9dfc7
Merge pull request #11933 from LK4D4/fix_err_mask
...
Various fixes for execdriver
Upstream-commit: f0ddbbaa8615b4afd89dc4e37f585bd041da7ba2
Component: engine
2015-03-30 17:12:35 -07:00
9ce95596ab
Do not mask *exec.ExitError
...
Fix #11764
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f468bbb7e8c89204bd5d8f346ecec4606b9f3b31
Component: engine
2015-03-30 15:31:49 -07:00
f91badaa49
Remove duplicate assignment
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: cc46ae8eaef2ce441e5f35412c4ee6ccbb65c2de
Component: engine
2015-03-30 23:07:43 +02:00
c6b7d50add
Get child processes before main process die
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5a1e5cf8c9bff51f6314754c039bf7511e2fb613
Component: engine
2015-03-30 13:28:34 -07:00
6af6b1f997
Use proper wait function for --pid=host
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 489ab77f4aea9bc3e7ada751cab5d827040b1e8b
Component: engine
2015-03-30 13:27:38 -07:00
e5b36a723c
Replace aliased imports of logrus, fixes #11762
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6f4d847046cb4e072de61d042c0266190d73a8c9
Component: engine
2015-03-26 23:22:04 +01:00
2031fb16f5
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)
Upstream-commit: 7dce9024947e6d573fc5ad0e2151e07c204c474c
Component: engine
2015-03-24 21:12:06 -07:00
9709821e24
Merge pull request #10527 from mfojtik/lxc_11
...
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
Upstream-commit: 22dba32b4dab6cec7b7a2d6dffa94a5fe713c2d3
Component: engine
2015-03-24 17:37:27 -07:00
08138d304c
Mkdir for lxc root dir before setup of symlink
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 246cab90f216e68c25178ffd19756ab864b809d0
Component: engine
2015-03-24 15:53:23 -07:00
d5ac91b394
Merge pull request #11716 from LK4D4/root_in_run
...
Use /var/run/docker as root for execdriver
Upstream-commit: f3fc857e018dc919fddfea645b8308379343cb4e
Component: engine
2015-03-24 14:58:30 -07:00
a6001c7df9
Use /var/run/docker as root for execdriver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 1e788ec9855058913de6ac8a2be7acee0f001954
Component: engine
2015-03-24 10:47:30 -07:00
ca334b9a3a
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)
Upstream-commit: fe9fe1473cc54c4d2962391d6fa05ecc1c2c96f1
Component: engine
2015-03-20 08:56:21 -04:00
4137db45c7
Merge pull request #11507 from crosbymichael/container-state
...
Cleanup libcontainer container state
Upstream-commit: 5a239c0022212d657313bc8d15af3b835dedbda1
Component: engine
2015-03-19 16:02:24 -07:00
a5bb86caaa
Merge pull request #11428 from vishh/parent-cgroup
...
Adding '--cgroup-parent' option.
Upstream-commit: 455a272aef4e109ce57c20f9ea224e4d4b32ece7
Component: engine
2015-03-19 14:41:57 -07:00
ec306144db
Mount libcontainer state dir in tmpfs
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 2b12b099b8c60f02142ab8ece68987a8fba00292
Component: engine
2015-03-19 14:27:17 -07:00
cb0e64d97b
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 >
Upstream-commit: 06c939e5279eb62b9088202a27d02d67c1cba6a5
Component: engine
2015-03-19 14:21:19 -07:00
67dd189d62
Update libcontainer to 4a72e540feb67091156b907c4700e580a99f5a9d
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 60ef4ae6fcb015546a646eb3b613344a9c4fc27b
Component: engine
2015-03-19 14:42:23 -04:00
825ed262fe
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
...
Signed-off-by: Michal Fojtik <mfojtik@redhat.com >
Upstream-commit: d62f25e4220d1d1ca792adf9c7423ee60a00c0d7
Component: engine
2015-03-19 14:51:05 +01:00
1f50057df8
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)
Upstream-commit: 0b1e2b5a553565e99afd7ceda36beab098f506d0
Component: engine
2015-03-19 02:34:15 +00:00
dc45397f85
Do not mask /proc/kcore in privileged
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: f4a458e67f9cedae9167cc70d15fd8bbe942f880
Component: engine
2015-03-18 14:17:21 -07:00
b6b5f87d20
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 >
Upstream-commit: f5a154f2d2b2bea5054ae35314d15021a8bf8ae4
Component: engine
2015-03-17 16:04:15 -07:00
