0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
46037 commits 14 branches 412 tags 338 MiB
Commit graph

7525 commits

Author SHA1 Message Date
Brian Goff
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
Tibor Vass
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
Michael Crosby
55f7dd8198 Merge pull request #7642 from LK4D4/style_fixes 
Style fixes for daemon package
 2014-08-26 10:59:05 -07:00
Michael Crosby
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
Alexandr Morozov
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
Alexandr Morozov
698392cb51 Remove redundant elses 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-26 09:28:54 +04:00
Alexandr Morozov
1ba15b8aca Use ++ instead of += 1 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-26 09:27:07 +04:00
Michael Crosby
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
Tibor Vass
34438efffe Merge pull request #7659 from somaopensource/soma 
daemon: rename from "delete" job to "rm"
 2014-08-25 15:54:14 -04:00
Alexandr Morozov
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
Chris Armstrong
ef9a5926e9 Fix typo for --restart deprecation 
Signed-off-by: Chris Armstrong <chris@opdemand.com>
 2014-08-22 12:56:43 -07:00
Victor Vieux
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
Vivek Dasgupta
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
limsy
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
Alexandr Morozov
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
Victor Vieux
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
Solomon Hykes
2a39635d30 Cleanup: move image depth checks in image/ 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-15 00:43:12 +00:00
Alexandr Morozov
0d4d7e4a28
Cleanup: Make channels unbuffered 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-14 21:51:25 +04:00
Alexandr Morozov
f1975cbc7c
Fix race on state serialization 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-14 21:51:15 +04:00
Alexandr Morozov
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
Alexandr Morozov
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
Victor Vieux
a0392324f1 another commit to do like @crosbymichael 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-14 01:36:26 +00:00
Victor Vieux
fcf37be2b1 remove double newline 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-14 01:08:27 +00:00
Michael Crosby
25c519e829 Deprecate --restart on the daemon 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 16:08:50 -07:00
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
c4a00d549d Honor the restarting state in Stop 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby
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
Michael Crosby
be22d7ac2d Add additional comments for vague lines 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby
6ae05936e1 Move container start event into monitor 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby
b7550cd456 Fix rebase around log event 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
2b0776c883 Refactor container monitor into type 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:56:53 -07:00
Michael Crosby
d9753ba20d Add typed RestartPolicy 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:56:34 -07:00
Michael Crosby
e0a076d486 Cleanup restart logic in monitor 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:56:34 -07:00
Michael Crosby
bd8c9dc239 Restart containers based on restart policy 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:56:34 -07:00
Josiah Kiehl
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
Victor Vieux
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
Michael Crosby
fd1b563b4f Merge pull request #7548 from crosbymichael/proxy-exec 
Move userland proxies out of daemon process
 2014-08-13 14:03:40 -07:00
Tibor Vass
0c6b137f06 Merge pull request #7484 from cpuguy83/cleanup_volume_init 
Cleanup: initializeVolume
 2014-08-13 16:18:02 -04:00
Brian Goff
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
Solomon Hykes
1d10c55aec Move remote API config out of daemon/ 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 19:25:51 +00:00
Solomon Hykes
1eba59eb24 Check for conflicting daemon config options in NewDaemon 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 19:25:51 +00:00
Solomon Hykes
353b7c8ec7 Parse daemon configuration in daemon.Config.InstallFlags instead of main 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 19:25:51 +00:00
Solomon Hykes
a4befff533 Move daemonconfig into daemon 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 19:09:51 +00:00
Michael Crosby
b4e2f5ed96 Move userland proxies out of daemon's process 
This PR moves the userland proxies for TCP and UDP traffic out of the
main docker daemon's process ( from goroutines per proxy ) to be a
separate reexec of the docker binary.  This reduces the cpu and memory
needed by the daemon and if the proxy processes crash for some reason
the daemon is unaffected.  This also displays in the standard process
tree so that a user can clearly see if there is a userland proxy that is
bound to a certain ip and port.

```bash
CONTAINER ID        IMAGE                       COMMAND             CREATED             STATUS              PORTS                                          NAMES
5d349506feb6        busybox:buildroot-2014.02   "sh"                13 minutes ago      Up 1 seconds        0.0.0.0:49153->81/tcp, 0.0.0.0:49154->90/tcp   hungry_pike
root@1cbfdcedc5a7:/go/src/github.com/docker/docker# ps aux
USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
root         1  0.0  0.1  18168  3100 ?        Ss   21:09   0:00 bash
root      8328  0.7  0.6 329072 13420 ?        Sl   22:03   0:00 docker -d -s vfs
root      8373  1.0  0.5 196500 10548 ?        Sl   22:03   0:00 userland-proxy -proto tcp -host-ip 0.0.0.0 -host-port 49153 -container-ip 10.0.0.2 -container-port 81
root      8382  1.0  0.5 270232 10576 ?        Sl   22:03   0:00 userland-proxy -proto tcp -host-ip 0.0.0.0 -host-port 49154 -container-ip 10.0.0.2 -container-port 90
root      8385  1.2  0.0   3168   184 pts/0    Ss+  22:03   0:00 sh
root      8408  0.0  0.1  15568  2112 ?        R+   22:03   0:00 ps aux
```

This also helps us to cleanly cleanup the proxy processes by stopping
these commands instead of trying to terminate a goroutine.

Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 11:54:47 -07:00