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
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
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
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
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
8e910346a3
Removes duplicate changelog entry
...
Upstream-commit: ca174ae84d37d89af726fa41e25a11bdaeca2067
Component: engine
2013-11-08 17:17:39 -05:00
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
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
4806ef83eb
Add unit test for child changes diff in aufs
...
Upstream-commit: f512049c8f9e64848cd8b1be794619f01c5227f2
Component: engine
2013-11-08 12:25:17 -08:00
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
c94da34819
Make sure dirs are created before injecting file
...
Upstream-commit: 20f690f1762e369e9ad761e166f22ff57a17275a
Component: engine
2013-11-08 12:06:15 -08:00
4c9c43a611
Use tmp dir in driver home
...
Upstream-commit: 6669c86fdf1ae07b66a6e178e269d797f6397bca
Component: engine
2013-11-08 11:56:34 -08:00
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
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
d9e6045c49
Name sure drivers are confined into their own dir
...
Upstream-commit: 08a276986c363c5b2e7435fb59935485c53aae59
Component: engine
2013-11-08 11:36:58 -08:00
bc930472df
Implement changes for aufs driver
...
Upstream-commit: ed1884461331d7c2d6561be30b09da9df6612d39
Component: engine
2013-11-08 11:10:33 -08:00
d042794393
Do not remove mountpoint on umount
...
Upstream-commit: 52f31657cc03c0097e6fd0d5e1d2c10fb31d2b95
Component: engine
2013-11-08 10:17:51 -08:00
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
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
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
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
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
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
807e6a9bd8
Add ImageInsert tests
...
Upstream-commit: bf8e0277bbd1c2df2310bc20ecc4003d1ed7a657
Component: engine
2013-11-08 00:16:45 -06:00
5090a5bd4b
Make "docker insert" errors obvious
...
Closes #1130
See also #1942
Upstream-commit: 5957dd909134fc3c3dc3e165b83559feb89d9f5b
Component: engine
2013-11-08 00:15:19 -06:00
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
b89c66d724
prevent panic if you use API in a wrong way
...
Upstream-commit: 49d7b87cfc4385470a5ecf181f92c13b8391c002
Component: engine
2013-11-07 18:54:00 -08:00
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
f7fbe4b377
Don't hardcode dependency on aufs in the tests
...
Upstream-commit: 1e5c61041f54de1146d8edb44e85b9419f4f6342
Component: engine
2013-11-08 02:49:08 +00:00
07ffba21a6
Don't rely on drivers for diff and export
...
Upstream-commit: 99210c9c6efbe10df922faa66fa3232ab898ef7b
Component: engine
2013-11-08 02:48:52 +00:00
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
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
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
2835e8d724
Improve aufs detection by looking at proc fs
...
Upstream-commit: 043a57617139dd4afefc2099e3bd85c8acaf0d68
Component: engine
2013-11-07 17:57:14 -08:00
a38c2eb35b
New 'dummy' driver uses plain directories and regular copy
...
Upstream-commit: 81674fbbdf657de2c1d13b7c84a41c9edd3c8aa1
Component: engine
2013-11-08 01:52:56 +00:00
f94c689b1e
Merge pull request #7 from crosbymichael/updated-interfaces
...
Updated aufs driver for new interface
Upstream-commit: 0a9df6bc1a8260fed2e038399106c8055689a9c8
Component: engine
2013-11-07 17:43:31 -08:00
600bb37cb7
Deprecate old tagging format
...
Upstream-commit: ef57752bce5c333d0e2b8352a84d071f21cce132
Component: engine
2013-11-07 17:30:51 -08:00
fb05315d03
Fix test for aufs graph and add aufs driver import
...
Upstream-commit: 12ffead71a06e5cf0ea4b1e6ce19231dceb265dc
Component: engine
2013-11-07 17:01:57 -08:00
681ed9aee0
Update aufs driver to new interface spec
...
Upstream-commit: b8b509e1c8c9b9def04850eaad8369b9ec6d9e0a
Component: engine
2013-11-07 16:46:47 -08:00
7362e77db4
Move Change to the archive package
...
Upstream-commit: 01990b65a3cf3da5e04aa6612a17ead2a6cac2c9
Component: engine
2013-11-07 16:46:47 -08:00
914824bce7
Move Change to the archive package, and fix a leftover merge in
...
Container.Inject()
Upstream-commit: 9ae4bcaaf8aa01da340341e47f99f83a59ce91dc
Component: engine
2013-11-08 00:45:07 +00:00
783f801512
gofmt
...
Upstream-commit: f1127b9308fbb4d4e21c3c5567ace9fdda82559d
Component: engine
2013-11-07 23:58:03 +00:00
04b54bb7ce
Merge pull request #2348 from SvenDowideit/2328-docker-events-since-date-string
...
Use string timestamp for docker events -since
Upstream-commit: 4f8b6c32830555d71fd1912610eeb82b66903821
Component: engine
2013-11-07 15:47:41 -08:00
d03901e0ad
Closes #2328 - allow the user to specify a string timestamp (not just a unix epoch) in the string format that the docker cli shows to the user
...
Upstream-commit: 01fea3cf116b768720b542ab65cbd1c2695848d0
Component: engine
2013-11-08 09:32:13 +10:00
c471d2b756
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
runtime.go
Upstream-commit: 165d1bdbc0c4236df9afe85d9cd8b1e65d625865
Component: engine
2013-11-07 23:26:52 +00:00
163d4a5b8f
- Included the sudo alternative as an example_header
...
Upstream-commit: eba3c36b386f389953eda6315948577200c9bf2c
Component: engine
2013-11-07 14:44:07 -08:00
5d51812837
devmapper: port to the new driver API and reactivate driver
...
Upstream-commit: 4a8a7d4edd53251c8de7ea087b092869e15621d5
Component: engine
2013-11-07 22:41:55 +00:00
7e3e167f73
Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface
...
Upstream-commit: f2bab1557c3fef4a95b5b982fe7127fcb29c4f8f
Component: engine
2013-11-07 22:38:50 +00:00
ce1bb0ce73
fix mergeConfig with new ports
...
Upstream-commit: 49c4231f077cb0b4804768231396c596d070a22f
Component: engine
2013-11-07 14:31:25 -08:00
07f796bd96
network: add iptables rules to explicitly allow forwarding
...
Explicitly enable container networking for Fedora and other distros that
have a REJECT all rule at the end of their FORWARD table.
Upstream-commit: ec4657b28a3e97447921357d454df974e0979ac6
Component: engine
2013-11-07 16:23:39 -06:00
