2a5e29adc6
Merge pull request #7677 from erikh/update_hosts_linked_containers
...
Update /etc/hosts when linked container is restarted
2014-08-27 19:54:09 -07:00
77eefbc688
Merge pull request #7672 from cpuguy83/cleanup_volumes_from
...
Cleanup: applyVolumesFrom
2014-08-27 19:43:16 -07:00
450740c891
Update /etc/hosts when linked container is restarted
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-08-27 18:23:41 -07:00
bd049b3800
Skip "no chain" error on deleting chain in Unmap
...
Fixes #6904
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-27 20:24:27 +04:00
7495fbc0e3
Cleanup: applyVolumesFrom
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-08-26 20:52:58 -04:00
c4a190db0c
Merge pull request #7744 from LK4D4/fix_race_cleanup_start_#6904
...
Fix race condition between cleanup and Start
2014-08-26 14:17:11 -04:00
55f7dd8198
Merge pull request #7642 from LK4D4/style_fixes
...
Style fixes for daemon package
2014-08-26 10:59:05 -07:00
89f64712fa
Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701
...
Handle error from GetDevice early
2014-08-26 10:53:40 -07:00
12ff89a390
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>
2014-08-26 20:57:12 +04:00
698392cb51
Remove redundant elses
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-26 09:28:54 +04:00
1ba15b8aca
Use ++ instead of += 1
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-26 09:27:07 +04:00
228eda4fd5
Merge pull request #7629 from LK4D4/fix_follow_hang_on_stop
...
Fix logs -f hanging on stopped containers
2014-08-25 15:24:20 -07:00
34438efffe
Merge pull request #7659 from somaopensource/soma
...
daemon: rename from "delete" job to "rm"
2014-08-25 15:54:14 -04:00
17b95ecb08
Handle error from GetDevice early
...
Also more verbose error.
Fixes panic from #7701
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-24 14:09:30 +04:00
ef9a5926e9
Fix typo for --restart deprecation
...
Signed-off-by: Chris Armstrong <chris@opdemand.com>
2014-08-22 12:56:43 -07:00
094cd7040b
Merge pull request #7638 from vivekdasgupta/minor-fixes
...
Fix data space reporting from Kb/Mb to KB/MB
2014-08-22 11:40:49 -05:00
a327d9b91e
Fix data space reporting from Kb/Mb to KB/MB
...
Docker-DCO-1.1-Signed-off-by: Vivek Dasgupta <vdasgupt@redhat.com> (github: vivekdasgupta)
2014-08-21 21:03:44 +05:30
239e932485
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>
2014-08-21 19:58:26 +09:00
badf8247af
Fix logs -f hanging on stopped containers
...
Fixes #7020
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-19 22:23:02 +04:00
f3b2c93b9f
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)
2014-08-19 17:06:17 +00:00
2a39635d30
Cleanup: move image depth checks in image/
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-15 00:43:12 +00:00
0d4d7e4a28
Cleanup: Make channels unbuffered
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-14 21:51:25 +04:00
f1975cbc7c
Fix race on state serialization
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-14 21:51:15 +04:00
93d6adf8a1
Fix race between container cleanup and inspect/ps
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-14 21:51:06 +04:00
1480168e9f
Fix race condition in sending started signal from monitor
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-14 21:50:56 +04:00
a0392324f1
another commit to do like @crosbymichael
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-08-14 01:36:26 +00:00
fcf37be2b1
remove double newline
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-08-14 01:08:27 +00:00
25c519e829
Deprecate --restart on the daemon
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 16:08:50 -07:00
73ced63680
Update based on comments from the code review
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:55 -07:00
2ec1b697c1
Rebased changes to return on first start's error
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:55 -07:00
ebf5d4657d
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>
2014-08-13 15:58:54 -07:00
972c894931
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>
2014-08-13 15:58:54 -07:00
c4a00d549d
Honor the restarting state in Stop
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
a2afb2b1e3
Add Restarting state when docker is handling the restart of containers
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
be22d7ac2d
Add additional comments for vague lines
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
6ae05936e1
Move container start event into monitor
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
b7550cd456
Fix rebase around log event
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
feda8fbb21
Restart conatiner with on-failure policy if exit code != 0
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
41870a42be
Only restart containers on daemon load with policy of always
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
860c13b788
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>
2014-08-13 15:57:37 -07:00
2b0776c883
Refactor container monitor into type
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:56:53 -07:00
d9753ba20d
Add typed RestartPolicy
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:56:34 -07:00
e0a076d486
Cleanup restart logic in monitor
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:56:34 -07:00
bd8c9dc239
Restart containers based on restart policy
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:56:34 -07:00
a02f67be5b
Extract log utils into pkg/log
...
Docker-DCO-1.1-Signed-off-by: Josiah Kiehl <josiah@capoferro.net> (github: capoferro)
2014-08-13 15:18:15 -07:00
13eb477b62
Merge pull request #7506 from shykes/cleanup-daemonconfig
...
Cleanup: refactor parsing and handling of Daemon config
2014-08-13 15:07:13 -07:00
fd1b563b4f
Merge pull request #7548 from crosbymichael/proxy-exec
...
Move userland proxies out of daemon process
2014-08-13 14:03:40 -07:00
0c6b137f06
Merge pull request #7484 from cpuguy83/cleanup_volume_init
...
Cleanup: initializeVolume
2014-08-13 16:18:02 -04:00
e350df5b2c
Cleanup: initializeVolume
...
- Use a common struct for Volumes
- Split out some functionality in intializeVolume into separate functions
- Removes some duplicate code
- In general much easier to grok the code now
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-08-13 15:55:59 -04:00
1d10c55aec
Move remote API config out of daemon/
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-13 19:25:51 +00:00
Michael Crosby
Victor Vieux
Alexandr Morozov
Brian Goff
Tibor Vass
Chris Armstrong
Victor Vieux
Vivek Dasgupta
limsy
Solomon Hykes
Michael Crosby
Josiah Kiehl