6d014fee93
Merge pull request #40 from shykes/creack-0.6.5-dm-plugin
...
Rename gograph and move drivers to sub pkg
Upstream-commit: 427649eee12c253ad24ec694353aea148e24eb08
Component: engine
2013-11-15 17:31:50 -08:00
73e6c3f45e
rename gograph in graphdb
...
Upstream-commit: cbd1281ec998e017b579c13ee6262aa21c96c38a
Component: engine
2013-11-15 15:55:45 -08:00
052ebaaf52
Move all drivers to the same subdir graphdriver
...
Upstream-commit: 035c1442424ee502118cdbf2ee2dddafcc0f01cd
Component: engine
2013-11-15 15:48:24 -08:00
bf47a58ff7
Merge pull request #38 from crosbymichael/add-container-driver
...
Save driver to container and skip incompat containers
Upstream-commit: fb245f79038294a1a3ea51f47ce2e62ffad6b5d1
Component: engine
2013-11-15 14:20:19 -08:00
d49c3e47d7
Merge pull request #36 from crosbymichael/unlink-init-files
...
Unlink docker init files
Upstream-commit: dc5b7b32c3ad42a6414a2c6bb0e1be6743c746fc
Component: engine
2013-11-15 14:09:51 -08:00
c579e87812
Merge pull request #33 from alexlarsson/dm-plugin-status
...
Add driver plugin status
Upstream-commit: 7cad77b1e2d0b8af5dcadce0599fc83cbe1970f4
Component: engine
2013-11-15 10:15:59 -08:00
b0ad480645
Merge pull request #34 from alexlarsson/dm-plugin-dummy-volumes
...
Use dummy driver for volumes
Upstream-commit: 2b23da1d2ff14c3f62a4c4b1ea78084598a58ca6
Component: engine
2013-11-15 09:41:16 -08:00
d77afe3b14
Merge pull request #30 from alexlarsson/dm-plugins-archive-tests
...
Dm plugins archive tests
Upstream-commit: bcf96d95bce927b23b03703f27965019e727313c
Component: engine
2013-11-15 09:38:17 -08:00
faff941ade
Use dummy driver for volumes
...
It makes no sense to use the aufs or devicemapper drivers for volumes.
The aufs one is perhaps not a big problem, but the devicemapper one
certainly is. It will be unnecessarily using a dm
blockdevice-over-loopback with a limited size base FS.
This just hardcodes the driver to be the dummy, perhaps in the future
we can have other drivers that make sense for the volumes.
Upstream-commit: 10f23a94f6daaf03c684937daea67d10205b4b89
Component: engine
2013-11-15 11:30:28 +01:00
fa730d3073
Print devicemapper status details in docker info
...
This adds a generic Status call in the Driver api and
implements if for the devicemapper backend.
The status is an array of key/value strings rather than a map so that
we can guarantee some static order of the docker info output.
Upstream-commit: 243843c0787ce2b56c8bbf72a2d4bd7604e84b2e
Component: engine
2013-11-15 11:04:02 +01:00
fb91dc2f0c
Show active driver in docker info output
...
Upstream-commit: 062810caedba973e76a3dd7eb9e45b56511eefc6
Component: engine
2013-11-15 10:24:48 +01:00
d9b9f3ddbd
Add tests for the changes detection code
...
This adds 3 tests:
Verify that ChangesDirs() returns nothing when run on a copy of the
same directory.
Verify that various mutations of a directory get reported with the
right changes.
Verify that ExportChanges() + ApplyLayer() of the above mutation gets
an identical directory.
Unfortunately the last test is disabled because it fails in multiple
ways atm. But I want to get it in so that we can fix it.
Upstream-commit: f7238f94e8b5b31e78360c342676ca84b5984806
Component: engine
2013-11-15 09:49:46 +01:00
b091059403
Use ExportChanges() in runtime.Diff()
...
This code was duplicated in two places, one which was unused. This
syncs the code and removes the unused version.
Upstream-commit: d69a6a20f0b6657821638ee591920d071a784b0e
Component: engine
2013-11-15 09:49:42 +01:00
b264af0c15
Save driver to container and skip incompat containers
...
For people who toggle drivers we want to save the driver used
to create a container so that if the driver changes we can skip
loading the container and it should not show up in docker ps
Upstream-commit: 4908d7f81db91f4a28be152ec0cacb0cf711b403
Component: engine
2013-11-14 22:53:59 -08:00
ea7ee7989a
Unlink docker init files
...
Upstream-commit: 29fa1b6666f28e7f42e92a10d195823fa84b7622
Component: engine
2013-11-14 21:23:23 -08:00
d3e492dda3
Merge pull request #32 from shykes/shykes-0.6.5-dm-plugin
...
Merge bug fix from dotcloud/docker master
Upstream-commit: 0c38f86e5e799e71866a3ee2f876c170e71c68d0
Component: engine
2013-11-14 16:21:19 -08:00
7ac1f80c52
Merge branch 'master' into shykes-0.6.5-dm-plugin
...
Upstream-commit: 8a358e88339c7ba8606bab2c2f8877175bf55598
Component: engine
2013-11-14 16:18:33 -08:00
0f14533ff9
Merge pull request #2704 from shykes/fix-auto-pull
...
Fix the brittle errorstring-to-httperror recognition code
Upstream-commit: 84ed18827a5903c7df61146a8fd716e8245830e7
Component: engine
2013-11-14 16:15:46 -08:00
d641b4b09e
Fix the brittle errorstring-to-httperror recognition code which in turn is required by autopull (the client issues a pull if container creation returns 404)
...
Upstream-commit: 693ff4d2ae5f0d723469340f67bb55f7aa3e824b
Component: engine
2013-11-14 23:54:28 +00:00
e63f1ff2a2
Merge pull request #31 from shykes/shykes-0.6.5-dm-plugin
...
Merge from dotcloud/docker master
Upstream-commit: eb06a7b8f87e14891b38f650e13e23760cf7a051
Component: engine
2013-11-14 14:14:13 -08:00
7686e1f389
Merge branch 'master' into shykes-0.6.5-dm-plugin
...
Conflicts:
utils.go
utils_test.go
Upstream-commit: 7cf60da38880534d76d031c4646fbd469d922385
Component: engine
2013-11-14 14:02:44 -08:00
39e4a0bc9e
ApplyLayer() use RemoveAll to handle removing directories
...
rmTargetPath can be a directory, so we have to use RemoveAll() or we
will fail to whiteout non-empty directories.
Upstream-commit: 006e2a600ce689770ba2c49805bc4f634976f365
Component: engine
2013-11-14 22:56:18 +01:00
5f7a312280
Merge branch 'dm-plugin-new-ChangesDirs' of https://github.com/alexlarsson/docker into alexlarsson-dm-plugin-new-ChangesDirs
...
Conflicts:
archive/changes.go
Upstream-commit: eace2dbe1d49ad6a990f5b42f092d3f4d77bf225
Component: engine
2013-11-14 12:23:01 -08:00
bf15883f56
Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm
...
Fix lxc start for shared root filesystems
Upstream-commit: 629c6e36492336f01fd4e25426a5c875f52628e2
Component: engine
2013-11-14 11:20:53 -08:00
43fe95ed51
Merge pull request #2691 from SvenDowideit/add-instruction-path-limitations
...
except URL-based ADDs
Upstream-commit: c7aaf831d7ae6ddd0a897c6f687d479904536107
Component: engine
2013-11-14 11:12:08 -08:00
1ac8c4289f
Merge pull request #29 from crosbymichael/try-load-aufs
...
Try to load aufs first then check in filesystems for aufs support
Upstream-commit: 099c53b28ef361c236b0c2b22dbf6a43bb647af2
Component: engine
2013-11-14 10:11:19 -08:00
93ce091ee1
Try to load aufs first then check in filesystems for aufs support
...
Upstream-commit: 7b2d59b91e64e72e346747cf2e561be8afc87fa7
Component: engine
2013-11-14 09:42:12 -08:00
ce293b5a8b
Merge pull request #28 from crosbymichael/close-sparse-files
...
Close sparse files when done
Upstream-commit: 529c30261efeede3a101fc62a0f72cbf992b3b02
Component: engine
2013-11-14 07:02:47 -08:00
7b5ae8dd36
thankyou @tomdz - I forgot about URL based ADDs
...
Upstream-commit: e42144674fb6eeb76bcda822105b049f7fb6ab30
Component: engine
2013-11-14 14:53:55 +10:00
d8cd1b4245
Merge pull request #2688 from dhrp/doc-layout-dotcloud-to-docker-inc
...
Updated documentation footer to say "Docker Inc." instead of dotCloud. And added Read the Docs.
Upstream-commit: 61abc3f8ac89bd3b238a7ceaf26fa004c462848b
Component: engine
2013-11-13 18:31:21 -08:00
e96e8ebc75
Merge pull request #2661 from rogaha/links_docs
...
- Added a doc about Links and Container Naming
Upstream-commit: 5fc56b6b47ede3f6c86177fa315743196854412b
Component: engine
2013-11-13 18:15:25 -08:00
cfec1cc83c
Close sparse files when done
...
Upstream-commit: bbc9fc79072bc259371aa96958336baaf8b53638
Component: engine
2013-11-13 17:05:32 -08:00
64a84d3816
Merge pull request #27 from shykes/refactor_dm
...
Add more dm unit tests
Upstream-commit: 7682ec04cd0a1b3a8244fe048ae20976404110f1
Component: engine
2013-11-13 16:50:26 -08:00
30fa838234
Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm
...
Upstream-commit: 590465b3952b008436193fc960a1d076071b1cad
Component: engine
2013-11-13 16:47:37 -08:00
ef863f235c
More dm unit tests
...
Upstream-commit: 05d70cbcf4ebf30b11d54a177e47649e4e229403
Component: engine
2013-11-13 16:46:10 -08:00
687d57d2f0
Updated 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
2013-11-13 16:09:23 -08:00
934d4ff883
Merge pull request #26 from shykes/refactor_dm
...
Refactor dm
Upstream-commit: 539708aa8afeeb2c55ed9cb25948ff44f6440df5
Component: engine
2013-11-13 15:45:58 -08:00
de8a847f51
Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm
...
Upstream-commit: 3aaef96e3677a08aa3ca175941afcc867c1aab7c
Component: engine
2013-11-13 15:44:13 -08:00
a6f6a49815
Merge pull request #25 from crosbymichael/add-aufs-diff-test
...
Add test for ApplyDiff
Upstream-commit: 921e2e9ae233ac4d3227b4d3c2c435e459672897
Component: engine
2013-11-13 15:43:26 -08:00
c2fdc4428e
Merge pull request #24 from crosbymichael/dm-tests
...
Add device mapper tests for driver.go
Upstream-commit: b50838c359ccf73b7fe2bff83b76db6d01d47643
Component: engine
2013-11-13 15:41:59 -08:00
e69802932f
Add devmapper_test.go
...
Upstream-commit: 4bebca848ea3546cd5813ab4c13b0248050454d8
Component: engine
2013-11-13 15:35:52 -08:00
dd83a25360
Add test coverage for devicemapper driver.go
...
Upstream-commit: 6b3dd02bb8068fd9f1d35e75db95d0650a1d3123
Component: engine
2013-11-13 14:56:26 -08:00
1b8dd1a73f
Make sure setInitialized is called when device is mounted
...
Upstream-commit: 80e73195583c5a9bf02c58ba92832a0bb2819361
Component: engine
2013-11-13 14:54:47 -08:00
3a53e72829
Create devmapper_wrapper.go
...
Upstream-commit: 1d188c8737f97a4882851ccd0150cd09c7f6c1e9
Component: engine
2013-11-13 14:36:31 -08:00
de14ff2222
Merge pull request #2679 from FreekKalter/master
...
fix error in python webapp example
Upstream-commit: 3cf23b93eaf0b51983204bb28182eb39c0791559
Component: engine
2013-11-13 13:35:01 -08:00
048409a651
Merge pull request #2676 from tianon/go1.2rc4
...
Update to go1.2rc4
Upstream-commit: 3ba6835ead266a9f365b897ca29db8de2278e994
Component: engine
2013-11-13 11:45:56 -08:00
240d1e68ec
Merge pull request #2686 from shykes/gofmt
...
gofmt
Upstream-commit: dc13b9473f19dec441f02de8aa79ca61b5d8b2ee
Component: engine
2013-11-13 11:35:37 -08:00
cea9cd6554
gofmt
...
Upstream-commit: b00d5f018541bf141dc4732ad6d71d23b8c28b43
Component: engine
2013-11-13 19:25:55 +00:00
8a1c75284e
Merge pull request #2660 from SvenDowideit/2601-remote-api-json-case
...
update the API docs to reflect the change in the case of the /index/search reposnse
Upstream-commit: 8e71391572adeaa6e5d0f980e71168ba8ef98b46
Component: engine
2013-11-13 11:17:54 -08:00
19f53e14f1
Add test for ApplyDiff
...
Upstream-commit: a69d86e0b19d804819d37a2a9edc03803267f579
Component: engine
2013-11-13 11:03:56 -08:00
