James Turnbull
a33628fd7c
Added status column to API client table
...
Upstream-commit: 5a1bfd9aa9a0983b5141dd8e393cc67a68fc6590
Component: engine
2013-11-10 12:14:45 -05:00
Mark Allen
9fcdb45469
Edits after code review
...
Return long image ID
Return streamformatted error or "raw" error
Upstream-commit: 8cc19765b48d1a429b840b731ed5fd5b81fbda3c
Component: engine
2013-11-10 00:06:55 -06:00
David Anderson
862e9a4dae
Correctly express "any address" to iptables.
...
Iptables interprets "-d 0.0.0.0" as "-d 0.0.0.0/32", not /0. This
results in the DNAT rule never matching any traffic if not bound
to a specific host IP.
Fixes #2598
Upstream-commit: 8ba8783bcc0ec3a0c5391445d52e2b2a9d0a3f8a
Component: engine
2013-11-09 19:40:56 -08:00
Roberto Gandolfo Hashioka
311c5ef875
- Updated description
...
Upstream-commit: 4ec0b515786ce266234d350fee872764974d2218
Component: engine
2013-11-09 11:08:43 -08:00
Tianon Gravi
e4cf9cf4dc
Fix the display of get.docker.io in Firefox by making our index files text/plain
...
Upstream-commit: 7f1b179c67476efa7dbafda55541b515fbe0f346
Component: engine
2013-11-09 02:28:04 -07:00
Sven Dowideit
d772cfe673
make all image ID and container ID API responses use the Long ID ( Closes #2098 )
...
Upstream-commit: b3974abe4f01d408850e245c9b52c77f3571e0b2
Component: engine
2013-11-09 12:16:49 +10:00
Solomon Hykes
7c76e102e9
Don't use drivers to store temporary image downloads
...
Upstream-commit: 948bb29d27dc7e367cd27003c059d83301b15c4f
Component: engine
2013-11-09 00:53:58 +00:00
Roberto Gandolfo Hashioka
f4773a7d1f
- Added delete all the containers example
...
Upstream-commit: 403f9fc357d64ccbdf82e1c4cbad2946eb1d1080
Component: engine
2013-11-08 16:47:42 -08:00
Michael Crosby
82d35959fb
Merge pull request #13 from crosbymichael/fix-volume-mount
...
Do not pass container information when creating a volume
Upstream-commit: 1f35531f396dba279b289a515416351568b96c0a
Component: engine
2013-11-08 16:35:00 -08:00
Michael Crosby
23a64a84bf
Merge pull request #12 from crosbymichael/core-driver-test-failures
...
Core driver test failures
Upstream-commit: f30c660f6fe5e313f24f1646f9b5aaa3b487f5ab
Component: engine
2013-11-08 16:33:53 -08:00
Tianon Gravi
1fdd529660
Update ubuntu packaging script, especially to stop docker group deletion
...
Upstream-commit: 498b6031b12da56c442d7c2b501f500766652b2d
Component: engine
2013-11-08 17:23:37 -07:00
Michael Crosby
911620a74d
Do not pass container information when creating a volume
...
Upstream-commit: ddb27268c98941b9f8a131b7b5403eb4d44beebb
Component: engine
2013-11-08 16:11:57 -08:00
Andy Rothfusz
bac845ad0c
Merge pull request #2590 from metalivedev/2585-addphplib
...
Fix 2585 and clean up warning in contributing.rst
Upstream-commit: f26da9638fc7daf0fac6c138ac3b9b040aef19fb
Component: engine
2013-11-08 15:35:24 -08:00
Michael Crosby
28000adccb
Allow drivers to export their own diff
...
Upstream-commit: 1eb00e1d5b375cb79d492f1c5cd95d7317bc543c
Component: engine
2013-11-08 15:32:50 -08:00
Guillaume J. Charmes
af669b6f79
Merge pull request #2615 from jpoimboe/ghost-networking-fix
...
setup network when reconnecting to ghost container
Upstream-commit: 126b17a0fff9dad720ab8e60563e7f92d781bd93
Component: engine
2013-11-08 15:31:55 -08:00
Andy Rothfusz
90f6287bc3
Fix 2585, rebase to master
...
Upstream-commit: 34d294c4615855dca1ff2399f9bed63885b33786
Component: engine
2013-11-08 15:15:45 -08:00
Victor Vieux
edd84b853d
prevent deletion if image is used by a running container
...
Upstream-commit: 45c2b5dc1a0d8f3658f012844f9d89fbb2290c42
Component: engine
2013-11-08 15:01:01 -08:00
Michael Crosby
f4f11a5ecb
Allow driver to provide changes if it impl the Changer interface
...
Upstream-commit: 95147675870e9e84deb354f09f0f670a5cb2b1e1
Component: engine
2013-11-08 14:54:20 -08:00
Tianon Gravi
0ed69503c9
Update release script to move https://get.docker.io/ubuntu/info to https://get.docker.io/ubuntu/ and provide a backwards-compatibility redirect (same for /builds/info)
...
Upstream-commit: f56945d71bcce6e7d18b3471bf4744ddd70b1783
Component: engine
2013-11-08 15:45:18 -07:00
Tianon Gravi
db48d3cf28
Update release script with proper support for non-*.docker.io bucket URLs
...
Upstream-commit: b8e7ec1b74fdeaeab56a8ffab801dcd87b7361ca
Component: engine
2013-11-08 15:44:52 -07:00
Guillaume J. Charmes
eb881bef2a
Merge pull request #2611 from seancron/changelog-edit
...
Removes duplicate changelog entry
Upstream-commit: 3bbe8ee0557a9961f96b228ece1b7ac2b6c64998
Component: engine
2013-11-08 14:39:02 -08:00
Josh Poimboeuf
67c8d19777
setup network when reconnecting to ghost container
...
Re-adding the line to setup the network when reconnecting to a ghost
container. It was inadvertently removed by commit
31638ab2ad2a5380d447780f05f7aa078c9421f5.
Upstream-commit: 2448058ee23292e2a167bbd6a2e138ad99e8b3b8
Component: engine
2013-11-08 16:28:41 -06:00
Sean Cronin
8e910346a3
Removes duplicate changelog entry
...
Upstream-commit: ca174ae84d37d89af726fa41e25a11bdaeca2067
Component: engine
2013-11-08 17:17:39 -05:00
Victor Vieux
30b875bb54
Merge pull request #2610 from stapelberg/patch-1
...
Return “err” instead of “nil” when MkdirAll() fails when binding a volume
Upstream-commit: f9dd0da182ee9ff7ac891884fa4720073130bed9
Component: engine
2013-11-08 14:00:06 -08:00
Michael Stapelberg
e5498d2e58
Return “err” instead of “nil” when MkdirAll() fails when binding a volume
...
Upstream-commit: e7fdcc15c5eb3812c71dd61f22a8d77d3ae72e36
Component: engine
2013-11-08 22:52:10 +01:00
Michael Crosby
4806ef83eb
Add unit test for child changes diff in aufs
...
Upstream-commit: f512049c8f9e64848cd8b1be794619f01c5227f2
Component: engine
2013-11-08 12:25:17 -08:00
Andy Rothfusz
08ddb7c17c
Merge pull request #2526 from metalivedev/2074-AddKnownIssues
...
Add Known Issue
Upstream-commit: 67b0b97a8f17c67e5599f4566c8a9e1a5bb401fe
Component: engine
2013-11-08 12:14:04 -08:00
Michael Crosby
c94da34819
Make sure dirs are created before injecting file
...
Upstream-commit: 20f690f1762e369e9ad761e166f22ff57a17275a
Component: engine
2013-11-08 12:06:15 -08:00
Michael Crosby
4c9c43a611
Use tmp dir in driver home
...
Upstream-commit: 6669c86fdf1ae07b66a6e178e269d797f6397bca
Component: engine
2013-11-08 11:56:34 -08:00
Solomon Hykes
22263cd931
Merge pull request #6 from alexlarsson/fix-ApplyLayer-remove
...
archive.ApplyLayer() remove files recursively
Upstream-commit: 78ef0bd9985d899dda6fdfc8c35d9ab47f7f07d7
Component: engine
2013-11-08 11:46:55 -08:00
Solomon Hykes
f101f6ce8f
Merge pull request #10 from crosbymichael/aufs-fixes
...
Aufs fixes and driver dir namespaceing
Upstream-commit: c1563de7a1b65c26fc3155194458b4c6097548e9
Component: engine
2013-11-08 11:45:45 -08:00
Michael Crosby
d9e6045c49
Name sure drivers are confined into their own dir
...
Upstream-commit: 08a276986c363c5b2e7435fb59935485c53aae59
Component: engine
2013-11-08 11:36:58 -08:00
Michael Crosby
bc930472df
Implement changes for aufs driver
...
Upstream-commit: ed1884461331d7c2d6561be30b09da9df6612d39
Component: engine
2013-11-08 11:10:33 -08:00
Michael Crosby
d042794393
Do not remove mountpoint on umount
...
Upstream-commit: 52f31657cc03c0097e6fd0d5e1d2c10fb31d2b95
Component: engine
2013-11-08 10:17:51 -08:00
Michael Crosby
5b0bff3941
Merge pull request #9 from crosbymichael/fix-aufs-tests
...
Fix aufs error at startup
Upstream-commit: 6d0b3f350e77b04f0270d0f719c2f40e8cd1bdda
Component: engine
2013-11-08 09:55:24 -08:00
Guillaume J. Charmes
d2333853d5
Merge pull request #2565 from danielnorberg/master
...
lock around read operations in graph
Upstream-commit: 310fbe7bb77c36a0d548c50dc6b5b7358a495a6a
Component: engine
2013-11-08 09:34:18 -08:00
Michael Crosby
9046a5ee9e
Merge pull request #2593 from dotcloud/2578
...
Fix mergeConfig with new ports
Upstream-commit: 3f2a5912eecfd54713e3b54bbf79be6702f13f25
Component: engine
2013-11-08 09:23:06 -08:00
Michael Crosby
fe2898af2e
Merge pull request #2597 from dotcloud/deprecate_separate_tag
...
Deprecate old tagging format
Upstream-commit: 65102d6b3644ff638bb6bf6cabb69af987e61004
Component: engine
2013-11-08 09:15:47 -08:00
Michael Crosby
2455088293
Merge pull request #2599 from dotcloud/prevent_panic_wrong_api_use
...
Prevent panic if you use API in a wrong way
Upstream-commit: 997a32706f5169ac1a6a9c3e34d5eae58ca8017d
Component: engine
2013-11-08 09:09:03 -08:00
Guillaume J. Charmes
d7936598e0
Merge pull request #2584 from dotcloud/docker-ci
...
docker-ci production sync
Upstream-commit: 5cf6ad4565374f924cdf64427d4e7b4adce50b41
Component: engine
2013-11-08 08:24:09 -08:00
Mark Allen
807e6a9bd8
Add ImageInsert tests
...
Upstream-commit: bf8e0277bbd1c2df2310bc20ecc4003d1ed7a657
Component: engine
2013-11-08 00:16:45 -06:00
David Sissitka
5090a5bd4b
Make "docker insert" errors obvious
...
Closes #1130
See also #1942
Upstream-commit: 5957dd909134fc3c3dc3e165b83559feb89d9f5b
Component: engine
2013-11-08 00:15:19 -06:00
Michael Crosby
491fee7d48
Fix aufs error at startup
...
Add String methods to other drivers
Upstream-commit: 51c93c0f3318efa95a02d25677a1a4837f1af9f6
Component: engine
2013-11-07 19:02:15 -08:00
Victor Vieux
b89c66d724
prevent panic if you use API in a wrong way
...
Upstream-commit: 49d7b87cfc4385470a5ecf181f92c13b8391c002
Component: engine
2013-11-07 18:54:00 -08:00
Solomon Hykes
54325d7ac7
Set DOCKER_DRIVER to override the choice of driver (aufs, devicemapper or dummy)
...
Upstream-commit: 8c21d2acd33c2bbaba224e19fbef30a3ba8788df
Component: engine
2013-11-08 02:49:32 +00:00
Solomon Hykes
f7fbe4b377
Don't hardcode dependency on aufs in the tests
...
Upstream-commit: 1e5c61041f54de1146d8edb44e85b9419f4f6342
Component: engine
2013-11-08 02:49:08 +00:00
Solomon Hykes
07ffba21a6
Don't rely on drivers for diff and export
...
Upstream-commit: 99210c9c6efbe10df922faa66fa3232ab898ef7b
Component: engine
2013-11-08 02:48:52 +00:00
Solomon Hykes
e1bd820a04
Fix a bug which caused Graph.Register to fail when Graph.Mktemp() returns an existing directory.
...
Upstream-commit: 1764cf1990791dd15636f6e906960ad43d5689ad
Component: engine
2013-11-08 02:13:11 +00:00
Victor Vieux
2f4c3fdf6d
Merge branch '1887-allow_ro_volumes-from' of https://github.com/daniel-garcia/docker into daniel-garcia-1887-allow_ro_volumes-from
...
Upstream-commit: f417c4b09955e3b250bec19a0d4b13ff30ba4e80
Component: engine
2013-11-07 17:59:55 -08:00
Solomon Hykes
8fcfb27c96
Merge pull request #8 from crosbymichael/improve-aufs-detection
...
aufs: Improve aufs detection by looking at proc fs
Upstream-commit: 9afe475edb190af53dc57e9db4522d73e7562ad5
Component: engine
2013-11-07 17:59:24 -08:00