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
3c67b07093
port published explicitly (for docker 0.6.6)
...
port 5984 to couchdb needs to be published explicitly in docker version 0.6.6
Upstream-commit: 492ce4c665b7d55d1496fb7e822a49ff0d44809d
Component: engine
2013-11-15 17:12:48 +01:00
61d22b0c3d
Merge pull request #1 from jpetazzo/2392-add-kernel-docs
...
Add warning about SYS_BOOT capability with pre-3.4 kernels and pre-0.8 LXC.
Upstream-commit: 76ab8fa00ffca136c50b58b4215eb063458f4a5b
Component: engine
2013-11-15 07:58:54 -08:00
bc283849de
path needs to be specified to 'docker build' command
...
current folder '.' appended as a path
Upstream-commit: 007964793dd619279bfb48c3fa84ada65aa599bd
Component: engine
2013-11-15 16:16:59 +01: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
a9461ab782
Merge pull request #2690 from codevin/master
...
Improvise documentation for builder.rst / VOLUME command
Upstream-commit: bed87ea1038321d4c58d379040acdbd824cb8b7c
Component: engine
2013-11-14 19:23:18 -08:00
3372c0c790
Move iptables test to integration tests
...
Upstream-commit: 823674816e59e1e8c3f768a97585c69e1d86ead8
Component: engine
2013-11-15 01:15:39 +00:00
2a4f3940f0
Split auth tests between unit tests and integration tests
...
Upstream-commit: 8d3e35cd8d92d184dc66041c235163cab4953842
Component: engine
2013-11-15 01:13:20 +00: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
26146eb208
move TestMount to integration
...
Upstream-commit: 596810d8db17c246c9c5107e7ecc6eb781454f36
Component: engine
2013-11-14 15:17:31 -08:00
7456f6a466
fix Integration tests
...
Upstream-commit: 661a8a0e0ce95d9bcb222184c14373fb1dbb1aec
Component: engine
2013-11-14 14:46:13 -08: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
54481185b5
Remove deprecated tags_test.go
...
Upstream-commit: e9624bf715134294a7fac1ab8a43508139000253
Component: engine
2013-11-14 10:50:43 -08:00
13d08cbd03
gofmt
...
Upstream-commit: 2a209afe5fe0f27296e3e06a199bb5305910e1cf
Component: engine
2013-11-14 10:50:43 -08:00
1880f01ff8
Integration tests: remove dependency on private APIs
...
Upstream-commit: c001a5af67b7b811a8fc69011fcffc2656b8fd99
Component: engine
2013-11-14 10:50:43 -08:00
6c1679864e
Move integration tests to integration/, expose missing public methods in the core
...
Upstream-commit: 359a6f49b9ec704686d0cb0df7cb0d7c8d5f55a7
Component: engine
2013-11-14 10:50:00 -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
d9f05e38d8
Removing sudo
...
Upstream-commit: 7267c4b746ad3b86d1174aeed4c06679476e8a27
Component: engine
2013-11-14 05:53:53 +00:00
04362619c5
Adding a makefile
...
Upstream-commit: 26533eb2c419155b93e3f403d081fb3c52d4dc45
Component: engine
2013-11-14 05:34:25 +00:00
7b5ae8dd36
thankyou @tomdz - I forgot about URL based ADDs
...
Upstream-commit: e42144674fb6eeb76bcda822105b049f7fb6ab30
Component: engine
2013-11-14 14:53:55 +10:00
7c37de4a14
Improvise documentation for builder.rst / VOLUME command
...
Upstream-commit: 37abc07852874939aabe7ba9a346d4d893e40409
Component: engine
2013-11-14 09:54:31 +05:30
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
35545fd6bb
Clean up sphinx syntax, upgrade http markup package, minor link changes, update intro.
...
Upstream-commit: 059950b095a48c254a9f407f2bff13eaab7a7a1c
Component: engine
2013-11-13 17:45:22 -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
