Michael Crosby
617edd89f4
Update docs based on feedback from review for --restart
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:57:37 -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
Tibor Vass
0d70706b4b
Merge pull request #7569 from erikh/pkg_log
...
Cleanup: Extract log utils into pkg/log
2014-08-13 18:43:08 -04:00
Victor Vieux
6b363b81de
Merge pull request #7572 from shykes/workaround-api-shutdown
...
Workaround to avoid 5 second delay on graceful daemon restart
2014-08-13 15:41:33 -07:00
Erik Hollensbe
ac63d925d2
move utils.Fataler to pkg/log.Fataler
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-13 15:32:41 -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
Solomon Hykes
6aecdb4f8e
Workaround to avoid 5 second delay on graceful daemon restart
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-13 21:40:25 +00: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
Solomon Hykes
2837a36bd7
Merge pull request #7570 from erikh/remove_fixme
...
Remove FIXME file
2014-08-13 13:55:20 -07:00
Olivier Gambier
49c43004a7
Merge pull request #7194 from vbatts/vbatts-registry_re-org
...
registry: cleanup and rename Registry -> Session
2014-08-13 13:37:56 -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
Erik Hollensbe
7bfc78b038
Remove FIXME file
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-13 12:49:12 -07:00
Solomon Hykes
a30fd7a962
Fix inconsistency in IP address parsing errors
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-13 19:25:51 +00: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
ca11b77471
opts.IPVal returns an error on incorrect input
...
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
6200002669
Helpers to parse lists, IPs, hosts, dns searches from the command line
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-13 19:25:47 +00:00
Michael Crosby
33fa175abf
Merge pull request #7568 from crosbymichael/replace-7240
...
Exit after receiving SIGTERM
2014-08-13 12:23:34 -07:00
Michael Crosby
cdf8a55670
Exit after receiving SIGTERM
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 12:18:23 -07:00
Solomon Hykes
6d59a56675
opts.IpOpt: a helper to parse IP addressed from the command line
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-13 19:09: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
Victor Vieux
c9c271858a
Merge pull request #6162 from vbatts/vbatts-ps_filter
...
docker ps: introducing filters
2014-08-13 11:44:48 -07:00
unclejack
c071cd7c7c
Merge pull request #7553 from LK4D4/update_to_1.3.1
...
bump Go to 1.3.1
2014-08-13 21:42:32 +03:00
Michael Crosby
283ee10886
Add Self func to reexec pkg to return the current binary path
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 11:14:33 -07:00
Michael Crosby
1c5a4e0900
Merge pull request #7559 from LK4D4/fix_udp_proxy_deadlock
...
Fix deadlock on failed dial in UDP userland proxy
2014-08-13 11:11:09 -07:00
Michael Crosby
ad7279e480
Merge pull request #7555 from LK4D4/fix_vet_warnings
...
Fix go vet warnings
2014-08-13 10:40:38 -07:00
Michael Crosby
3cc79e7818
Merge pull request #7556 from shykes/cristian-integration-maintainer
...
Add Cristian to integration/MAINTAINERS
2014-08-13 10:39:50 -07:00
Michael Crosby
c9e359cf97
Merge pull request #7497 from shykes/cleanup-server
...
Remove deprecated server package
2014-08-13 10:37:37 -07:00
James Turnbull
8c38a3d732
Merge pull request #7552 from michaelthies/patch-1
...
Update postgresql_service.md
2014-08-13 09:40:51 -04:00
Vincent Batts
752dd707ac
registry.Registry -> registry.Session
...
renaming this struct to more clearly be session, as that is what it
handles.
Splitting out files for easier readability.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-08-13 09:27:43 -04:00
Alexandr Morozov
6cbb8e070d
Fix deadlock on failed dial in UDP userland proxy
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-13 17:18:37 +04:00
Vincent Batts
84146719d8
docker ps: introducing filters
...
* starting with filtering for exit codes. `docker ps -a --filter 'exited=1'`
* API doc for filter parameter
* formatting filters for help usage
* tweaks for review
This requires https://github.com/dotcloud/docker/pull/4430
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-08-13 09:12:33 -04:00
Tianon Gravi
57f6b3e1ec
Merge pull request #7545 from tianon/mkimage-lucid-fix
...
Fix contrib/mkimage/debootstrap for Lucid
2014-08-13 06:46:51 -06:00
Solomon Hykes
7d1b2ebde8
Add Cristian to hack/MAINTAINERS
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-13 08:13:51 +00:00
Solomon Hykes
da63a93e89
Add Cristian to integration/MAINTAINERS
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-13 07:50:40 +00:00
Alexandr Morozov
391c35c822
Fix go vet warnings
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-13 11:37:30 +04:00
Solomon Hykes
63503cafe4
Remove deprecated server/ package
...
Victory!
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-13 06:56:45 +00:00
Alexandr Morozov
c6595b3ee8
bump Go to 1.3.1
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-13 10:49:03 +04:00
Michael Thies
99423e7e1e
Update postgresql_service.md
...
fix typo
2014-08-12 23:30:04 -05:00
Solomon Hykes
491deae9b8
Move "build" to daemon/build.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-13 03:12:33 +00:00
Michael Crosby
64579f51fc
Merge pull request #7301 from vieux/fix_goroutines_leak_exit_code
...
fix goroutines leak and exit code
2014-08-12 17:37:24 -07:00
Victor Vieux
b06311a72e
fix goroutines leak and exit code
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-08-13 00:03:56 +00:00