35545fd6bbClean up sphinx syntax, upgrade http markup package, minor link changes, update intro. Upstream-commit: 059950b095a48c254a9f407f2bff13eaab7a7a1c Component: engine
Andy Rothfusz
2013-11-13 17:45:22 -08:00
cfec1cc83cClose sparse files when done Upstream-commit: bbc9fc79072bc259371aa96958336baaf8b53638 Component: engine
Michael Crosby
2013-11-13 17:05:32 -08:00
64a84d3816Merge pull request #27 from shykes/refactor_dm
Michael Crosby
2013-11-13 16:50:26 -08:00
30fa838234Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm Upstream-commit: 590465b3952b008436193fc960a1d076071b1cad Component: engine
Guillaume J. Charmes
2013-11-13 16:47:37 -08:00
ef863f235cMore dm unit tests Upstream-commit: 05d70cbcf4ebf30b11d54a177e47649e4e229403 Component: engine
Guillaume J. Charmes
2013-11-13 16:46:10 -08:00
687d57d2f0Updated documentation footer to say "Docker Inc." instead of dotCloud. And added link to Read the Docs for giving them credit to hosting us. (Thanks Read The Docs!) Upstream-commit: 9ab85f4d1220d04a3b682d5612ff27db5983f5d3 Component: engine
Thatcher Peskens
2013-11-13 16:09:23 -08:00
934d4ff883Merge pull request #26 from shykes/refactor_dm
Michael Crosby
2013-11-13 15:45:58 -08:00
de8a847f51Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm Upstream-commit: 3aaef96e3677a08aa3ca175941afcc867c1aab7c Component: engine
Guillaume J. Charmes
2013-11-13 15:44:13 -08:00
a6f6a49815Merge pull request #25 from crosbymichael/add-aufs-diff-test
Guillaume J. Charmes
2013-11-13 15:43:26 -08:00
c2fdc4428eMerge pull request #24 from crosbymichael/dm-tests
Guillaume J. Charmes
2013-11-13 15:41:59 -08:00
dd83a25360Add test coverage for devicemapper driver.go Upstream-commit: 6b3dd02bb8068fd9f1d35e75db95d0650a1d3123 Component: engine
Michael Crosby
2013-11-13 14:56:26 -08:00
1b8dd1a73fMake sure setInitialized is called when device is mounted Upstream-commit: 80e73195583c5a9bf02c58ba92832a0bb2819361 Component: engine
Michael Crosby
2013-11-13 14:54:47 -08:00
32f37aa122Merge pull request #23 from crosbymichael/ignore-dir-sizes
Guillaume J. Charmes
2013-11-13 10:40:03 -08:00
01395ce3bbAdd more depth to the upstart example in host_integration.rst
Ryan Seto
2013-11-13 13:34:34 -05:00
2e972c6b88Ignore dir sizes in TreeSize func Upstream-commit: a4f14528c25c4a092c30334d05008fe44275a79e Component: engine
Michael Crosby
2013-11-13 10:33:24 -08:00
a905d364a8Add warning about SYS_BOOT capability with pre-3.4 kernels and pre-0.8 LXC. Upstream-commit: 8145e57cee6390bb27d7fb07fe5f572affe5d0cd Component: engine
Jérôme Petazzoni
2013-11-13 10:29:29 -08:00
0f9abe6bf6Merge pull request #2680 from inglesp/patch-1
Guillaume J. Charmes
2013-11-13 09:19:37 -08:00
59d38006c9add a little more info about the limitations of ADD wrt ../ and docker build - Upstream-commit: af0b2e38c3b2688cd4c2e831847bf4601d8fc149 Component: engine
¨Sven
2013-11-13 22:55:55 +10:00
172689d6bbfix error in python webapp example
Freek Kalter
2013-11-13 13:20:38 +01:00
b5a0f0ad5bupdate the v1.7 API to reflect the case change in the /index/search response, and note that its to align better with the registry server response that its proxying Upstream-commit: f0f8462d18cf2efc44ee48cfdd2706e8a4a800d6 Component: engine
¨Sven
2013-11-13 22:09:44 +10:00
d85082acd3Minor code simplification for Containers api Upstream-commit: 0013aa7d9f74eab1c6d02cf9f7b35a1b9364b17a Component: engine
Xiuming Chen
2013-11-13 01:29:00 -08:00
d033d0366cuse Binds key in hostConfig to detect volumes mounted from external. Upstream-commit: 1d7f22c0d4bb55cf797b303cc46b1944509e4085 Component: engine
Liang-Chi Hsieh
2013-11-13 14:59:24 +08:00
9f0beed503skip the volumes mounted when deleting the volumes of container. Upstream-commit: 6a693176d6b2dbf4afd36ebda2aeb9495fdf42bc Component: engine
Liang-Chi Hsieh
2013-10-31 23:49:30 +08:00
5c6b4b612cMerge pull request #2648 from dotcloud/docker_kill_exit_code
Victor Vieux
2013-11-12 14:40:17 -08:00
4f1e360778Merge pull request #22 from shykes/shykes-0.6.5-dm-plugin
Michael Crosby
2013-11-12 12:30:30 -08:00
071e45dc12Merge pull request #2663 from viirya/fix_nameserver_regex
Guillaume J. Charmes
2013-11-12 12:29:40 -08:00
ce008ff5b0Fix ImageTree test Upstream-commit: 08623dc216227d6377cb4558caedd75cacf68755 Component: engine
Guillaume J. Charmes
2013-11-12 12:25:35 -08:00
88636cc70aMerge pull request #17 from alexlarsson/dm-plugin-whiteout-directory
Guillaume J. Charmes
2013-11-12 12:16:30 -08:00
82914826a6archive.ApplyLayer() - handle directory whiteouts
Alexander Larsson
2013-11-11 17:39:19 +01:00
ce2d4b5f4cMerge pull request #21 from crosbymichael/pull-parent-layers
Guillaume J. Charmes
2013-11-12 11:50:20 -08:00
67a0c658d3Pull parent layers first before children Upstream-commit: 7301fbe035ca450e2aea86b8f2467cffd3fac18b Component: engine
Michael Crosby
2013-11-12 11:48:35 -08:00
18c77ffe37Merge pull request #20 from crosbymichael/force-driver-to-implement-differ
Guillaume J. Charmes
2013-11-12 11:48:20 -08:00
9c96f5d03bMerge pull request #2662 from dotcloud/do_not_cleanup_start_if_running
Victor Vieux
2013-11-12 11:02:10 -08:00
6ba500a617Merge pull request #2614 from dotcloud/prevent_delete_image_running_container
Victor Vieux
2013-11-12 11:01:51 -08:00
b17fc3fb8eMerge pull request #2657 from dotcloud/fix_docker_images_output
Victor Vieux
2013-11-12 11:01:29 -08:00
89853bca87Merge pull request #2669 from tianon/clarify-test-calls
Victor Vieux
2013-11-12 10:42:24 -08:00
78d1d60f74Add clarification of multiple "go test" calls in hack/make/*test Upstream-commit: 5cdb3aec507d9df7bb98366f04c4303a2172cbd5 Component: engine
Tianon Gravi
2013-11-12 11:23:06 -07:00
9bdd66f858- Improved documentation and typos fixing (Thanks to @jamtur01) Upstream-commit: 353243a7254705f92c3d775eec1f9cfe14fa4170 Component: engine
Roberto Gandolfo Hashioka
2013-11-12 10:11:52 -08:00
5ec9c64577modify test of GetNameserversAsCIDR for its regex change. Upstream-commit: 879aa29cb09c641bbd510eed03647f8f85f0d559 Component: engine
Liang-Chi Hsieh
2013-11-12 18:18:30 +08:00
084cb15f1aAllow drivers to implement ApplyDiff in Differ interface Upstream-commit: 5d9723002bc764e2c768e5184994d7949f55fc49 Component: engine
Michael Crosby
2013-11-11 17:17:38 -08:00
943cd7996bon docker start, do not cleanup if already running Upstream-commit: bc6d87284174c1a862603a2da574ff60bb03e0fa Component: engine
Victor Vieux
2013-11-11 18:15:38 -08:00
c75d132f03- Added a doc about Links and Container Naming Upstream-commit: 981560c43631e1b09b6f90945d2d5e58345cabd2 Component: engine
Roberto Gandolfo Hashioka
2013-11-11 17:38:54 -08:00
b60d444c4fMerge pull request #2527 from jpoimboe/fedora-iptables-fix
Victor Vieux
2013-11-11 15:12:40 -08:00
1e55bfad23Merge pull request #2621 from rogaha/rm_del_all_example
Andy Rothfusz
2013-11-11 14:55:50 -08:00
b93991acb1Add ability to exclude files from tar Upstream-commit: 2c7f50a77dc281289387008b4a08656e7e5328be Component: engine
Michael Crosby
2013-11-11 14:30:38 -08:00
ae06d51230Merge pull request #2630 from jamtur01/api_status
Andy Rothfusz
2013-11-11 11:56:04 -08:00
29829cd5d2Just return the id; nothing else. Upstream-commit: 62f873aa1f918fe4d303f6168f66d057e6776b18 Component: engine
Mark Allen
2013-11-11 13:26:24 -06:00
10393910abUpdate upstart check in sysvinit to be exactly the same as the init_is_upstart function from /lib/lsb/init-functions (which isn't available in 12.04 or we'd use it directly) Upstream-commit: 88edba7e86efc8d7e118a9863ab701f0b5493d62 Component: engine
Tianon Gravi
2013-11-11 11:57:25 -07:00
675c173a12Hack: set NONUKE environment variable to run the tests without cleanup, to investigate temp directories Upstream-commit: ec6fe9f2007a0400a441b79c89bced5727589ba9 Component: engine
Solomon Hykes
2013-11-11 18:56:21 +00:00
4a3b02d57dMerge pull request #2633 from danderson/2598-fix-iptables-anydest
Michael Crosby
2013-11-11 10:22:02 -08:00
97bc55ee5dAdd /etc/default/docker support to upstart, too (mirroring sysvinit) Upstream-commit: 7cf7dda87d59981f8a1727725f6d914dcc4c1815 Component: engine
Tianon Gravi
2013-11-11 11:13:16 -07:00
60cd8ebc40Fix sysvinit upstart detection and give it a pretty message Upstream-commit: bb76157d240ae871bc3d9b6a945a982abf0473c7 Component: engine
Tianon Gravi
2013-11-11 11:10:19 -07:00
0d32d7f5f1Merge pull request #2574 from crosbymichael/api-port-changes
Andy Rothfusz
2013-11-11 09:59:48 -08:00
a52e1003c4Make sure docker kill exit with failure in case of error Upstream-commit: 8149439d956489a551f9e197ca2adbae85e78ff0 Component: engine
Guillaume J. Charmes
2013-11-11 09:15:51 -08:00
504a744b38Fix formatting in tests Upstream-commit: 402a58a75a5b9813c889bf6c030bb756f86e56d4 Component: engine
Guillaume J. Charmes
2013-11-11 09:05:38 -08:00
122fd6b9c2Implement fallback operation for driver.Diff()
Alexander Larsson
2013-11-11 16:47:36 +01:00
f7888fafe9Update contrib/vagrant-docker with projects available Upstream-commit: 9c7a8edddd447e64069f0cd108bee4d008049c49 Component: engine
Fabio Rehm
2013-11-11 13:36:44 -02:00
d30197ef54archive.ChagesDir() - faster and better implementation
Alexander Larsson
2013-11-11 14:35:29 +01:00
8f13be5bb1Remove devicemapper lazy initialization
Alexander Larsson
2013-10-24 21:04:49 +02:00
8c7ea81910CONTRIBUTING: wrap a couple of long lines
Ramkumar Ramachandra
2013-11-11 10:45:26 +05:30
a33628fd7cAdded status column to API client table Upstream-commit: 5a1bfd9aa9a0983b5141dd8e393cc67a68fc6590 Component: engine
James Turnbull
2013-11-09 14:10:00 -05:00
9fcdb45469Edits after code review
Mark Allen
2013-11-10 00:06:55 -06:00
862e9a4daeCorrectly express "any address" to iptables.
David Anderson
2013-11-09 19:31:08 -08:00
e4cf9cf4dcFix the display of get.docker.io in Firefox by making our index files text/plain Upstream-commit: 7f1b179c67476efa7dbafda55541b515fbe0f346 Component: engine
Tianon Gravi
2013-11-09 02:28:04 -07:00
d772cfe673make all image ID and container ID API responses use the Long ID (Closes#2098) Upstream-commit: b3974abe4f01d408850e245c9b52c77f3571e0b2 Component: engine
Sven Dowideit
2013-10-25 11:59:59 +10:00