76ca127323
Merge Container and State mutexes
...
Resolved all deadlocks and fixed race between kill and
monitor.resetContainer
Fixes #7600
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 517ba44e3742c39c4c3fc249b8c40e9b7ddd845f
Component: engine
2014-08-29 12:56:04 +04:00
b36a54587e
builder: fix references to jobs in daemon, make builder a first class
...
package referring to evaluator
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 1ae4c00a19edb7d3b41c050489e56339833d8e01
Component: engine
2014-08-27 18:52:30 -07:00
364fb8763b
Merge pull request #7677 from erikh/update_hosts_linked_containers
...
Update /etc/hosts when linked container is restarted
Upstream-commit: 2a5e29adc62b0a45e7548c51e5cebc4855d54b48
Component: engine
2014-08-27 19:54:09 -07:00
a040de5fce
Merge pull request #7672 from cpuguy83/cleanup_volumes_from
...
Cleanup: applyVolumesFrom
Upstream-commit: 77eefbc68894c77862608632822619abfc0c58d6
Component: engine
2014-08-27 19:43:16 -07:00
ac32065d5c
Update /etc/hosts when linked container is restarted
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 450740c891c60dda15b7abe29f35b8e142c2c40e
Component: engine
2014-08-27 18:23:41 -07:00
04c32fc20e
Skip "no chain" error on deleting chain in Unmap
...
Fixes #6904
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: bd049b3800b967bba06d03fd23ab135c51467ae3
Component: engine
2014-08-27 20:24:27 +04:00
054561d764
Cleanup: applyVolumesFrom
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 7495fbc0e3f23c932562cb02ea6e7df204d29dfa
Component: engine
2014-08-26 20:52:58 -04:00
b00ca614f6
Merge pull request #7744 from LK4D4/fix_race_cleanup_start_#6904
...
Fix race condition between cleanup and Start
Upstream-commit: c4a190db0c7020ee39672421d1bbca3678f86683
Component: engine
2014-08-26 14:17:11 -04:00
f5f64f68ea
Merge pull request #7642 from LK4D4/style_fixes
...
Style fixes for daemon package
Upstream-commit: 55f7dd8198549b704089a51662e3c511d028706c
Component: engine
2014-08-26 10:59:05 -07:00
ff69012bd1
Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701
...
Handle error from GetDevice early
Upstream-commit: 89f64712faecddbfd92c7bfe6612dd5890c966dd
Component: engine
2014-08-26 10:53:40 -07:00
62eb5165d1
Fix race condition between cleanup and Start
...
There was problem when Start might be before cleanup
Fixes #6904
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 12ff89a3901cd2debf13e7ccc3a1a780380e4dd9
Component: engine
2014-08-26 20:57:12 +04:00
6eedef59d9
Remove redundant elses
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 698392cb512ba0c85e69a669f115d67c1d50cb98
Component: engine
2014-08-26 09:28:54 +04:00
71bf8c685a
Use ++ instead of += 1
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 1ba15b8acaf8625db23ccd7d0ba7d3acf7d2f69e
Component: engine
2014-08-26 09:27:07 +04:00
601611b982
Merge pull request #7629 from LK4D4/fix_follow_hang_on_stop
...
Fix logs -f hanging on stopped containers
Upstream-commit: 228eda4fd5a79dfe5eab1194f4133a71472fef0e
Component: engine
2014-08-25 15:24:20 -07:00
ddfb7cb734
Merge pull request #7659 from somaopensource/soma
...
daemon: rename from "delete" job to "rm"
Upstream-commit: 34438efffefdf4a2d93e5b2192dff4645828d745
Component: engine
2014-08-25 15:54:14 -04:00
81067d8cbd
Handle error from GetDevice early
...
Also more verbose error.
Fixes panic from #7701
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 17b95ecb08f1705bd74d6c94c8bcfd4c87ccfca6
Component: engine
2014-08-24 14:09:30 +04:00
21c698ffdf
Fix typo for --restart deprecation
...
Signed-off-by: Chris Armstrong <chris@opdemand.com >
Upstream-commit: ef9a5926e9af408d68b3c68638a69727e42079fa
Component: engine
2014-08-22 12:56:43 -07:00
f77d69a509
Merge pull request #7638 from vivekdasgupta/minor-fixes
...
Fix data space reporting from Kb/Mb to KB/MB
Upstream-commit: 094cd7040b538910f6b4d1d362162185099eb5af
Component: engine
2014-08-22 11:40:49 -05:00
65adfb2362
Fix data space reporting from Kb/Mb to KB/MB
...
Docker-DCO-1.1-Signed-off-by: Vivek Dasgupta <vdasgupt@redhat.com > (github: vivekdasgupta)
Upstream-commit: a327d9b91edf6d36ee5b286ebe968bcca6658f5b
Component: engine
2014-08-21 21:03:44 +05:30
87669d6e48
daemon: rename from "delete" job to "rm"
...
This commit fixes following FIXMEs:
// FIXME: rename "delete" to "rm" for consistency with the CLI command
// FIXME: rename ContainerDestroy to ContainerRm for consistency with the CLI command
Signed-off-by: lim seong yeol <seongyeol37@gmail.com >
Upstream-commit: 239e932485c3e0f72a4f88ce1301ebe269eb2e27
Component: engine
2014-08-21 19:58:26 +09:00
1ff07a2840
Fix logs -f hanging on stopped containers
...
Fixes #7020
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: badf8247afa378d04835ec19243ede2fb89a7b31
Component: engine
2014-08-19 22:23:02 +04:00
796b032af2
allow /etc/hosts /etc/resolv.conf and /etc/hostname to be changed
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: f3b2c93b9f01ac909de4f93753a21eacb02bcd9f
Component: engine
2014-08-19 17:06:17 +00:00
ef058f588f
Cleanup: move image depth checks in image/
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 2a39635d30a5ecbf3f8020dcb272cd8ae939fe06
Component: engine
2014-08-15 00:43:12 +00:00
0b9e4ed61e
Cleanup: Make channels unbuffered
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 0d4d7e4a2851c60f768f71a79a78c068fd9dffe8
Component: engine
2014-08-14 21:51:25 +04:00
c26305d808
Fix race on state serialization
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: f1975cbc7c5b551e5a206c15f32aef3d51904408
Component: engine
2014-08-14 21:51:15 +04:00
1b8bad68b3
Fix race between container cleanup and inspect/ps
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 93d6adf8a19855edf118d27d0239222f572d8292
Component: engine
2014-08-14 21:51:06 +04:00
f4db7d15dc
Fix race condition in sending started signal from monitor
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 1480168e9f6178e4015aa4dcc035a6963c59f431
Component: engine
2014-08-14 21:50:56 +04:00
9df494bb71
another commit to do like @crosbymichael
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: a0392324f194f4f92e3205f0c0ed8b71dc2fc93f
Component: engine
2014-08-14 01:36:26 +00:00
0bb709c134
remove double newline
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: fcf37be2b1efa11da1958658da0e04755a225c89
Component: engine
2014-08-14 01:08:27 +00:00
9b55fc0736
Deprecate --restart on the daemon
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 25c519e829640ebb23061b82c6ace88c5983b63d
Component: engine
2014-08-13 16:08:50 -07:00
db45de23ad
Update based on comments from the code review
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 73ced636800c150640e2f0d307842b0f9259b611
Component: engine
2014-08-13 15:58:55 -07:00
02f3d4abed
Rebased changes to return on first start's error
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 2ec1b697c1a7c0ecc534b9ebffd7ba40ea285ff7
Component: engine
2014-08-13 15:58:55 -07:00
10b2364f13
Reguardless of success reset time increment
...
Reset the time increment if the container's execution time is greater
than 10s or else as a container runs and is restarted the time will grow
overtime.
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: ebf5d4657d14c7b57a5ca1c7b8689077b18b33dc
Component: engine
2014-08-13 15:58:54 -07:00
9726fa5fb8
Improve wait during restart
...
We need to do this so that when a user asks docker to stop the container
and it is currently in the restart loop we don't want to have to wait
for the duration of the restart time increment before ack. the stop.
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 972c89493148f930388097816663d453bf3e8c2c
Component: engine
2014-08-13 15:58:54 -07:00
5ac7ecfbf7
Honor the restarting state in Stop
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: c4a00d549d0b895bb990491cbdf58aabe2891842
Component: engine
2014-08-13 15:58:54 -07:00
73d4ecfe93
Add Restarting state when docker is handling the restart of containers
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: a2afb2b1e37e72cab0d68cfe8dd0ec830b7a54e5
Component: engine
2014-08-13 15:58:54 -07:00
6ce3708a40
Add additional comments for vague lines
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: be22d7ac2db6396becd63ec2dd28b9731011c9b9
Component: engine
2014-08-13 15:58:54 -07:00
1f88a5f013
Move container start event into monitor
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 6ae05936e1f343a2ecc51b8f642bdc8b93325d81
Component: engine
2014-08-13 15:58:54 -07:00
4dadb32ece
Fix rebase around log event
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: b7550cd456e29874279499a546b07bb062a12096
Component: engine
2014-08-13 15:58:54 -07:00
1c96d24788
Restart conatiner with on-failure policy if exit code != 0
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: feda8fbb21489f64aa3b7340c94473a08502bd6b
Component: engine
2014-08-13 15:58:54 -07:00
91b1d9394b
Only restart containers on daemon load with policy of always
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 41870a42bee9c394c61aba4bd81f782dbd38da12
Component: engine
2014-08-13 15:58:54 -07:00
ed9f19284d
Add documentation and update restart rules.
...
Implement time backed backoff for restarting and fix failure count when
the maximum is 0
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 860c13b788944410a98a6ad5b5cfb74de0a8405b
Component: engine
2014-08-13 15:57:37 -07:00
b614c77a54
Refactor container monitor into type
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 2b0776c883c41cda0b86808fe86e4df6e1aa1cd5
Component: engine
2014-08-13 15:56:53 -07:00
a9837fc603
Add typed RestartPolicy
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: d9753ba20d5e602b0980687353d76c874b563042
Component: engine
2014-08-13 15:56:34 -07:00
b662f7de79
Cleanup restart logic in monitor
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: e0a076d486ea49529dc3aeef2179eb0c406d0773
Component: engine
2014-08-13 15:56:34 -07:00
49eb58207e
Restart containers based on restart policy
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: bd8c9dc2395032a893e959e48f9a8536858d67e0
Component: engine
2014-08-13 15:56:34 -07:00
4737f7cea5
Extract log utils into pkg/log
...
Docker-DCO-1.1-Signed-off-by: Josiah Kiehl <josiah@capoferro.net > (github: capoferro)
Upstream-commit: a02f67be5b17da63d475e6f35956c1e72c3b2e7b
Component: engine
2014-08-13 15:18:15 -07:00
1a6b687cce
Merge pull request #7506 from shykes/cleanup-daemonconfig
...
Cleanup: refactor parsing and handling of Daemon config
Upstream-commit: 13eb477b62b51d906fa88f508d2c560a2b4946aa
Component: engine
2014-08-13 15:07:13 -07:00
fdd5ed90fc
Merge pull request #7548 from crosbymichael/proxy-exec
...
Move userland proxies out of daemon process
Upstream-commit: fd1b563b4faede0a1d3fc91d4243442ab2ebe1a6
Component: engine
2014-08-13 14:03:40 -07:00
ccc89a6404
Merge pull request #7484 from cpuguy83/cleanup_volume_init
...
Cleanup: initializeVolume
Upstream-commit: 0c6b137f0602b619b3947e4c9737ccb363c91d96
Component: engine
2014-08-13 16:18:02 -04:00
