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
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
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
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
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
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
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
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
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
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
ChristoperBiscardi
df9650eebb
Private Repos Copy Change
...
Docker-DCO-1.1-Signed-off-by: Christopher Biscardi <biscarch@sketcht.com> (github: ChristopherBiscardi)
2014-08-11 16:37:58 -07:00
lalyos
58ef92f89e
Fix equal short-long version number comparison
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com>
2014-08-11 23:40:35 +02:00
lalyos
8a4d2d6f7f
Add test case for identical short and long version numbers
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com>
2014-08-11 23:36:09 +02:00
Fred Lifton
8595a4ff7a
Merge pull request #7516 from thaJeztah/faqs-explain-debian-noninteractive
...
Add "DEBIAN_FRONTEND" to FAQ
2014-08-11 14:19:06 -07:00
Sebastiaan van Stijn
2e5d35c1f1
Add "DEBIAN_FRONTEND" to FAQ
...
Added some explanation on using ‘DEBIAN_FRONTEND’ to the FAQs. As
discussed here;
https://github.com/docker/docker/pull/7035#issuecomment-50967867
Docker-DCO-1.1-Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (github: thaJeztah)
2014-08-11 23:12:47 +02:00
Michael Crosby
57e0cbb991
Merge pull request #7507 from shykes/cleanup-tiny
...
Cleanup: tiny little things
2014-08-11 12:41:17 -07:00
Michael Crosby
9694209241
Fix hack in old integration test for new init
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-11 11:47:22 -07:00
Michael Crosby
29af9c14e4
Remove unsued sysinit package
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-11 11:47:21 -07:00
Michael Crosby
7321067176
Use argv0 as reexec implementation for dockerinit
...
This changes the way the exec drivers work by not specifing a -driver
flag on reexec. For each of the exec drivers they register their own
functions that will be matched aginst the argv 0 on exec and called if
they match.
This also allows any functionality to be added to docker so that the
binary can be reexec'd and any type of function can be called. I moved
the flag parsing on docker exec to the specific initializers so that the
implementations do not bleed into one another. This also allows for
more flexability within reexec initializers to specify their own flags
and options.
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-11 11:47:21 -07:00
Tibor Vass
e033425f0b
Merge pull request #7502 from LK4D4/catch_error_console
...
Catch error on console creation
2014-08-11 12:13:53 -04:00
Tibor Vass
5ffbc8dc82
Merge pull request #7509 from LK4D4/fix_http_handler_error_log
...
Fix log message on http handler error
2014-08-11 12:12:33 -04:00
Tibor Vass
e94d772910
Merge pull request #7499 from LK4D4/fix_events_error
...
Fix error message on logging events
2014-08-11 12:10:30 -04:00
Tibor Vass
a9ff2fdfac
Merge pull request #7520 from LK4D4/more_events_test
...
More events test
2014-08-11 12:09:11 -04:00