985ab960df
Merge pull request #7570 from erikh/remove_fixme
...
Remove FIXME file
Upstream-commit: 2837a36bd73081b314004a9afcf4b2beada4821f
Component: engine
2014-08-13 13:55:20 -07:00
903e5fe7e2
Merge pull request #7194 from vbatts/vbatts-registry_re-org
...
registry: cleanup and rename Registry -> Session
Upstream-commit: 49c43004a73e2e23e895c3340451342ffe496bba
Component: engine
2014-08-13 13:37:56 -07:00
ccc89a6404
Merge pull request #7484 from cpuguy83/cleanup_volume_init
...
Cleanup: initializeVolume
Upstream-commit: 0c6b137f0602b619b3947e4c9737ccb363c91d96
Component: engine
2014-08-13 16:18:02 -04:00
5f2e120f77
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)
Upstream-commit: e350df5b2c95be74c5808c28cac5dee763b11d8b
Component: engine
2014-08-13 15:55:59 -04:00
de738eef04
Remove FIXME file
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 7bfc78b03813fd35b0098b1e778180138976c40d
Component: engine
2014-08-13 12:49:12 -07:00
14291aae78
Exit after receiving SIGTERM
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: cdf8a55670793a135a53549c5e1877c33a66be0c
Component: engine
2014-08-13 12:18:23 -07:00
779c425729
Merge pull request #6162 from vbatts/vbatts-ps_filter
...
docker ps: introducing filters
Upstream-commit: c9c271858a652583ba548cb2ea75df68b51a9dd3
Component: engine
2014-08-13 11:44:48 -07:00
8aa76c02e6
Merge pull request #7553 from LK4D4/update_to_1.3.1
...
bump Go to 1.3.1
Upstream-commit: c071cd7c7ccd3a0da7d5a9331119cd2e84e4380a
Component: engine
2014-08-13 21:42:32 +03:00
09e4804b95
Merge pull request #7559 from LK4D4/fix_udp_proxy_deadlock
...
Fix deadlock on failed dial in UDP userland proxy
Upstream-commit: 1c5a4e09006b5b91f1bf5b3f020625a539fd165f
Component: engine
2014-08-13 11:11:09 -07:00
92c1c69d9f
Merge pull request #7555 from LK4D4/fix_vet_warnings
...
Fix go vet warnings
Upstream-commit: ad7279e48053adfde3ba20a5c67e812a7ec677f6
Component: engine
2014-08-13 10:40:38 -07:00
03178ee6e6
Merge pull request #7556 from shykes/cristian-integration-maintainer
...
Add Cristian to integration/MAINTAINERS
Upstream-commit: 3cc79e7818f0859ec1b84fef7e50a7c1d8209b96
Component: engine
2014-08-13 10:39:50 -07:00
6f9dfebc7f
Merge pull request #7497 from shykes/cleanup-server
...
Remove deprecated server package
Upstream-commit: c9e359cf977fbbfaf32527c2c3f71a1910deb21a
Component: engine
2014-08-13 10:37:37 -07:00
865b17dc7d
Merge pull request #7552 from michaelthies/patch-1
...
Update postgresql_service.md
Upstream-commit: 8c38a3d7321b75b2344dbf3efaf1e93437f9bac0
Component: engine
2014-08-13 09:40:51 -04:00
955bae5653
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 >
Upstream-commit: 752dd707ac09cdcd88307b28aa9e39ac7c763b44
Component: engine
2014-08-13 09:27:43 -04:00
08557c40b7
Fix deadlock on failed dial in UDP userland proxy
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 6cbb8e070d6c3a66bf48fbe5cbf689557eee23db
Component: engine
2014-08-13 17:18:37 +04:00
acbbac3aa0
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)
Upstream-commit: 84146719d8b8322e302e7a0250fe8a3ee1a4edcd
Component: engine
2014-08-13 09:12:33 -04:00
b5e0d56fb1
Merge pull request #7545 from tianon/mkimage-lucid-fix
...
Fix contrib/mkimage/debootstrap for Lucid
Upstream-commit: 57f6b3e1ecafa706bffed5d44f69c8dfddcff06f
Component: engine
2014-08-13 06:46:51 -06:00
defddfab5d
Add Cristian to hack/MAINTAINERS
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 7d1b2ebde8a0d1484f486b5ea01b1a77014b958b
Component: engine
2014-08-13 08:13:51 +00:00
fc45b3edd5
Add Cristian to integration/MAINTAINERS
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: da63a93e89f2ea8f35f22a082f4a406456fc6a09
Component: engine
2014-08-13 07:50:40 +00:00
00b87e1af9
Fix go vet warnings
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 391c35c82252633eb415fdade08103a8a0818fde
Component: engine
2014-08-13 11:37:30 +04:00
d27f6d0c6d
Remove deprecated server/ package
...
Victory!
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 63503cafe4addb7d275244fbcce0e10d67225cc9
Component: engine
2014-08-13 06:56:45 +00:00
b0523c12b8
bump Go to 1.3.1
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: c6595b3ee83d5cf8348739949e74720e62f7dd50
Component: engine
2014-08-13 10:49:03 +04:00
ca40497b63
Update postgresql_service.md
...
fix typo
Upstream-commit: 99423e7e1ef7d833e333389b15a372179734c03f
Component: engine
2014-08-12 23:30:04 -05:00
3ab02734f3
Move "build" to daemon/build.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 491deae9b8866b5b0774bbc92ee82f7cd7b565eb
Component: engine
2014-08-13 03:12:33 +00:00
01c8dcaf20
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 >
Upstream-commit: b06311a72e7979653f09ba8175e10733e7116985
Component: engine
2014-08-13 00:03:56 +00:00
a11716ca83
fix #7374 leftover
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: bcfd6a653b5038679246b023d83476be073d4c91
Component: engine
2014-08-12 23:37:33 +00:00
f82c0c847e
Merge pull request #7359 from timthelion/patch-10
...
Add process for PR acceptance, review, rejection
Upstream-commit: 3de3719290d63e1827ad61c84256e5cc219dea91
Component: engine
2014-08-12 19:17:10 -04:00
dc6c9f58e7
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 >
Upstream-commit: 631fadc0b9c46c1af82f9161deab83a7fb797c2a
Component: engine
2014-08-12 15:37:42 -06:00
0a10aaa4dd
Merge pull request #7538 from LK4D4/move_some_integration_to_cli
...
Move some integration to cli
Upstream-commit: 91a2f22acac569b8e1bf279845c53e0499de50d4
Component: engine
2014-08-12 14:17:08 -07:00
db1cb3039c
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)
Upstream-commit: e4a09cd79d0ee3fbb6a33552a21c53491d9f3953
Component: engine
2014-08-12 20:29:45 +00:00
b1b27b03fb
Merge pull request #7466 from tiborvass/irc-meetings
...
Add irc-meetings section in CONTRIBUTING
Upstream-commit: 18a0eba72dfec57b02a799ae064a60a88d6988c9
Component: engine
2014-08-12 13:36:57 -04:00
137daba41a
Add irc-meetings section in CONTRIBUTING
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: c58c70b8bdfc4d13faefaab31d2d1539d5478223
Component: engine
2014-08-12 13:35:14 -04:00
9418307e16
Merge pull request #7528 from lalyos/fix_version_number_comparison
...
Fix version number comparison
Upstream-commit: 0771eb32dc2e52bd05053d8a0e529741fa639d49
Component: engine
2014-08-12 10:16:55 -07:00
547d1e2095
Merge pull request #7531 from ChristopherBiscardi/priv-repos
...
Private Repos Copy Change
Upstream-commit: d42326d9277dd12946981c7435d468807c462157
Component: engine
2014-08-12 09:50:21 -04:00
855652ad6c
Move TestRunExit to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: c19e0fe7e2c626218c854aa97fd3f23d29f11615
Component: engine
2014-08-12 13:40:14 +04:00
3f9bc8ad8a
Move TestRunWorkdirExistsAndIsFile to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: a44f065f171cb91867630e752c09fde4b01d4c98
Component: engine
2014-08-12 12:22:25 +04:00
f5781e0e49
Updates docs regarding linux mint troubleshot
...
Signed-off-by: Ciro S. Costa <ciro.costa@usp.br >
Upstream-commit: fcddecc828a95083db8975391e623289b2fe1254
Component: engine
2014-08-12 02:56:57 -03:00
7d5baeee4d
Merge pull request #7490 from crosbymichael/reexec
...
Use argv0 as reexec implementation for dockerinit
Upstream-commit: 01995ebebb3f26a2bd1e1131b5794e8b6b6ae18e
Component: engine
2014-08-11 18:43:34 -07:00
47e45ae0eb
Panic if trying to register an func with the same name
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 1a249a5feb9880465594299c1d4965b160e4a14e
Component: engine
2014-08-11 18:13:27 -07:00
b38de9ff8f
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)
Upstream-commit: b94f2c4c6d6fa7b3efc0dbf8874735b12d00b57c
Component: engine
2014-08-12 10:32:38 +10:00
9379864263
Private Repos Copy Change
...
Docker-DCO-1.1-Signed-off-by: Christopher Biscardi <biscarch@sketcht.com > (github: ChristopherBiscardi)
Upstream-commit: df9650eebb12d980aaf114ac7b2223764dc964b7
Component: engine
2014-08-11 16:37:58 -07:00
424449854e
Fix equal short-long version number comparison
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com >
Upstream-commit: 58ef92f89e5c6637506d2d03784daba50e82d7ff
Component: engine
2014-08-11 23:40:35 +02:00
29770af1da
Add test case for identical short and long version numbers
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com >
Upstream-commit: 8a4d2d6f7fc2f9ab5ea488d4b4ba76313862fbc0
Component: engine
2014-08-11 23:36:09 +02:00
09bdb7ffa9
Merge pull request #7516 from thaJeztah/faqs-explain-debian-noninteractive
...
Add "DEBIAN_FRONTEND" to FAQ
Upstream-commit: 8595a4ff7a18f6eb80e28d49d4dbecca794b369e
Component: engine
2014-08-11 14:19:06 -07:00
1b06736c1b
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)
Upstream-commit: 2e5d35c1f1bf0b565b288fa9146059d9f3af61b7
Component: engine
2014-08-11 23:12:47 +02:00
c9eb513960
Merge pull request #7507 from shykes/cleanup-tiny
...
Cleanup: tiny little things
Upstream-commit: 57e0cbb991783f3b5a6b24afe6c5978cd9839a01
Component: engine
2014-08-11 12:41:17 -07:00
42c37ddd04
Fix hack in old integration test for new init
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 9694209241074c10d4cc625b24dfedcb2387de93
Component: engine
2014-08-11 11:47:22 -07:00
6697829a68
Remove unsued sysinit package
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 29af9c14e442f5cf3760f439d8c0fffaf84e2268
Component: engine
2014-08-11 11:47:21 -07:00
2fbe59b1d9
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 >
Upstream-commit: 73210671764fc3de133a627205582e069e1ff43d
Component: engine
2014-08-11 11:47:21 -07:00
349e2e4036
Merge pull request #7502 from LK4D4/catch_error_console
...
Catch error on console creation
Upstream-commit: e033425f0bcf58f1409e7a10a408c778f1c754e4
Component: engine
2014-08-11 12:13:53 -04:00
