Michael Crosby
2d65b723cd
Add container migration to aufs driver
...
Upstream-commit: 29f07f854497571db570be79c8df878624f5b41c
Component: engine
2013-11-18 18:39:21 -08:00
Michael Crosby
3688213d04
Migrate images with parent relationship
...
Upstream-commit: f88b760809677109a723f25399f738d756f14c13
Component: engine
2013-11-18 16:17:43 -08:00
Michael Crosby
80e02fbc62
Use tryRelocate to fall back to symlink if rename fails
...
Upstream-commit: 94e854823f3549eeddaafa24835093966d9aaeeb
Component: engine
2013-11-18 13:16:28 -08:00
Guillaume J. Charmes
9d193b1c00
WIP
...
Upstream-commit: a518b847511f034d9bfd4166e17f8f0eac61d021
Component: engine
2013-11-15 17:16:30 -08:00
Guillaume J. Charmes
73e6c3f45e
rename gograph in graphdb
...
Upstream-commit: cbd1281ec998e017b579c13ee6262aa21c96c38a
Component: engine
2013-11-15 15:55:45 -08:00
Guillaume J. Charmes
052ebaaf52
Move all drivers to the same subdir graphdriver
...
Upstream-commit: 035c1442424ee502118cdbf2ee2dddafcc0f01cd
Component: engine
2013-11-15 15:48:24 -08:00
Guillaume J. Charmes
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
Michael Crosby
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
Michael Crosby
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
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Alexander Larsson
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
Alexander Larsson
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
Alexander Larsson
fb91dc2f0c
Show active driver in docker info output
...
Upstream-commit: 062810caedba973e76a3dd7eb9e45b56511eefc6
Component: engine
2013-11-15 10:24:48 +01:00
Alexander Larsson
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
Alexander Larsson
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
Michael Crosby
ea7ee7989a
Unlink docker init files
...
Upstream-commit: 29fa1b6666f28e7f42e92a10d195823fa84b7622
Component: engine
2013-11-14 21:23:23 -08:00
Guillaume J. Charmes
7ac1f80c52
Merge branch 'master' into shykes-0.6.5-dm-plugin
...
Upstream-commit: 8a358e88339c7ba8606bab2c2f8877175bf55598
Component: engine
2013-11-14 16:18:33 -08:00
Solomon Hykes
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
Guillaume J. Charmes
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
Alexander Larsson
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
¨Sven
7b5ae8dd36
thankyou @tomdz - I forgot about URL based ADDs
...
Upstream-commit: e42144674fb6eeb76bcda822105b049f7fb6ab30
Component: engine
2013-11-14 14:53:55 +10:00
Andy Rothfusz
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
Andy Rothfusz
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
Michael Crosby
cfec1cc83c
Close sparse files when done
...
Upstream-commit: bbc9fc79072bc259371aa96958336baaf8b53638
Component: engine
2013-11-13 17:05:32 -08:00
Guillaume J. Charmes
ef863f235c
More dm unit tests
...
Upstream-commit: 05d70cbcf4ebf30b11d54a177e47649e4e229403
Component: engine
2013-11-13 16:46:10 -08:00
Thatcher Peskens
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
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Guillaume J. Charmes
e69802932f
Add devmapper_test.go
...
Upstream-commit: 4bebca848ea3546cd5813ab4c13b0248050454d8
Component: engine
2013-11-13 15:35:52 -08:00
Michael Crosby
dd83a25360
Add test coverage for devicemapper driver.go
...
Upstream-commit: 6b3dd02bb8068fd9f1d35e75db95d0650a1d3123
Component: engine
2013-11-13 14:56:26 -08:00
Michael Crosby
1b8dd1a73f
Make sure setInitialized is called when device is mounted
...
Upstream-commit: 80e73195583c5a9bf02c58ba92832a0bb2819361
Component: engine
2013-11-13 14:54:47 -08:00
Guillaume J. Charmes
3a53e72829
Create devmapper_wrapper.go
...
Upstream-commit: 1d188c8737f97a4882851ccd0150cd09c7f6c1e9
Component: engine
2013-11-13 14:36:31 -08:00
Andy Rothfusz
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
Guillaume J. Charmes
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
Solomon Hykes
cea9cd6554
gofmt
...
Upstream-commit: b00d5f018541bf141dc4732ad6d71d23b8c28b43
Component: engine
2013-11-13 19:25:55 +00:00
Andy Rothfusz
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
Michael Crosby
19f53e14f1
Add test for ApplyDiff
...
Upstream-commit: a69d86e0b19d804819d37a2a9edc03803267f579
Component: engine
2013-11-13 11:03:56 -08:00
Andy Rothfusz
cbc18a2e03
Merge pull request #2681 from SvenDowideit/add-instruction-path-limitations
...
add a little more info about the limitations of ADD wrt ../ and docker build
Upstream-commit: 077c2496ed39b6682924b1da9d388e5a21453310
Component: engine
2013-11-13 10:56:35 -08:00
Guillaume J. Charmes
60ef46d821
Merge pull request #15 from alexlarsson/dm-plugin-explicit-init
...
Remove devicemapper lazy initialization
Upstream-commit: 46ab7d1e8a4256a39ee700ae217fedca20bc1ccf
Component: engine
2013-11-13 10:46:24 -08:00
Tianon Gravi
6b9d5c5bd5
Merge pull request #2652 from tianon/upstart-defaults-too
...
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
Upstream-commit: b94e9ed0de0817d07ad590e5d32262016f25e6e8
Component: engine
2013-11-13 10:42:41 -08:00
Michael Crosby
2e972c6b88
Ignore dir sizes in TreeSize func
...
Upstream-commit: a4f14528c25c4a092c30334d05008fe44275a79e
Component: engine
2013-11-13 10:33:24 -08:00
Solomon Hykes
95762ca3a4
Merge pull request #2673 from shykes/engine-patch-2
...
* Engine: expand the engine API with 'create' and 'start' jobs Edit
Upstream-commit: c964494d315ea672e2a4987cbfd9c9e8852553b8
Component: engine
2013-11-13 10:14:56 -08:00
Solomon Hykes
2a405d59e4
Merge pull request #2656 from shykes/export-restrictions-debian
...
Change crypto export notice to meet Debian requirements
Upstream-commit: c6e83b8779f6792163548f216f6402f691e3ee61
Component: engine
2013-11-13 09:37:23 -08:00
¨Sven
59d38006c9
add a little more info about the limitations of ADD wrt ../ and docker build -
...
Upstream-commit: af0b2e38c3b2688cd4c2e831847bf4601d8fc149
Component: engine
2013-11-13 22:55:55 +10:00
inglesp
6d93aad6a7
Typo in ROADMAP.md
...
Upstream-commit: 87b4bb9fcc41806da4ed3151e74511120c099115
Component: engine
2013-11-13 12:32:49 +00:00
Freek Kalter
172689d6bb
fix error in python webapp example
...
When getting the private port used by a container using
`docker port` returns 0.0.0.0:49353, stript just the portnumber of the address with awk to used it in the rest of the example code.
Upstream-commit: f5e6c2d060d5eb052929c4ab14bf3256b260afc4
Component: engine
2013-11-13 13:20:38 +01:00
