1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
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
Mark Steve Samson
e224c4caa4 Add integration test for restart command
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
2014-08-13 10:01:27 +08: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
Tibor Vass
136631df46 Merge pull request #7549 from vieux/fix_leftover
fix #7374 leftover
2014-08-12 19:51:57 -04:00
Victor Vieux
bcfd6a653b fix #7374 leftover
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-08-12 23:37:33 +00:00
Andy Rothfusz
10ec205b77 Updated AUTHORS file
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
2014-08-12 16:19:10 -07:00
James Turnbull
3de3719290 Merge pull request #7359 from timthelion/patch-10
Add process for PR acceptance, review, rejection
2014-08-12 19:17:10 -04:00
Hollie Teal
e608312677 Removed merge conflict artifacts.
Signed-off-by: Hollie Teal <hollie@docker.com>
2014-08-12 15:30:21 -07:00
Hollie Teal
af5ced62ca Added fredlf's suggested changes.
Signed-off-by: Hollie Teal <hollie@docker.com>
2014-08-12 15:21:55 -07:00
Tianon Gravi
631fadc0b9 Fix contrib/mkimage/debootstrap for Lucid
Later versions of `apt` are smart enough to just create this directory if it's missing, but Lucid balks (just like `gnupg` and `gpgv` aren't in the Required set so don't come in a minbase -- good ol' Lucid).

Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-12 15:37:42 -06:00
Victor Vieux
91a2f22aca Merge pull request #7538 from LK4D4/move_some_integration_to_cli
Move some integration to cli
2014-08-12 14:17:08 -07:00
Timothy Hobbs
e4a09cd79d Add process for PR acceptance, review, rejection
This is an extremely tentative PR.  However, I feel that the suggestions are generally good.

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
2014-08-12 20:29:45 +00:00
Andy Rothfusz
8830653977 Fix my email entry so that my current email is first and the old commit email second.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
2014-08-12 13:24:42 -07:00
Aanand Prasad
dc857a7ad5 Merge pull request #404 from bfirsh/validate-dco
Validate DCO on Travis
2014-08-12 11:20:38 -07:00
Ben Firshman
aca0e42178 Validate DCO on Travis
Copied straight from Docker, replacing github.com/docker/docker
with github.com/docker/fig in .validate.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-12 10:58:16 -07:00
Tibor Vass
18a0eba72d Merge pull request #7466 from tiborvass/irc-meetings
Add irc-meetings section in CONTRIBUTING
2014-08-12 13:36:57 -04:00
Tibor Vass
c58c70b8bd Add irc-meetings section in CONTRIBUTING
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-12 13:35:14 -04:00
Victor Vieux
0771eb32dc Merge pull request #7528 from lalyos/fix_version_number_comparison
Fix version number comparison
2014-08-12 10:16:55 -07:00
Ben Firshman
15037ce0e5 Merge pull request #397 from alunduil/master
Exclude tests package from installation.
2014-08-12 18:16:50 +01:00
James Turnbull
d42326d927 Merge pull request #7531 from ChristopherBiscardi/priv-repos
Private Repos Copy Change
2014-08-12 09:50:21 -04:00
James Turnbull
96b52545ab Merge pull request #7533 from cirocosta/patch-1
Updates docs regarding linux mint troubleshot
2014-08-12 08:21:30 -04:00
O.S. Tezer
7df5493071 Docs: articles/certificates.md rewrite.
This commit contains a re-structured re-write of the original
certificated.md file, containing the amendments proposed with
PR #7120 (commit ID bd28595e310ccfa98) by @timthelion.

Related to: https://github.com/dotcloud/docker/pull/7120

2014-07-30: Update/rebase/squash based on the comments from @jamtur01 and @fredlf.
2014-08-12: Update/rebase/squash based on the comments from @fredlf (of 2014-08-12).

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-08-12 14:49:08 +03:00
Alexandr Morozov
c19e0fe7e2 Move TestRunExit to integration-cli
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-12 13:40:14 +04:00
Alexandr Morozov
a44f065f17 Move TestRunWorkdirExistsAndIsFile to integration-cli
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-12 12:22:25 +04:00
Ciro S. Costa
fcddecc828 Updates docs regarding linux mint troubleshot
Signed-off-by: Ciro S. Costa <ciro.costa@usp.br>
2014-08-12 02:56:57 -03:00
Mark Steve Samson
9d55e01e2a Implement restart command (Closes #98)
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
2014-08-12 10:07:20 +08:00
Victor Vieux
01995ebebb Merge pull request #7490 from crosbymichael/reexec
Use argv0 as reexec implementation for dockerinit
2014-08-11 18:43:34 -07:00
Michael Crosby
1a249a5feb Panic if trying to register an func with the same name
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-11 18:13:27 -07:00
Sven Dowideit
2c882a482e Merge pull request #7398 from SvenDowideit/add-more-details-to-https-docs
tell the user what to expect, including that it is a verbose process.
2014-08-12 10:35:28 +10:00
Sven Dowideit
b94f2c4c6d tell the user what to expect, including that it is a verbode process.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-08-12 10:32:38 +10:00