243843c078
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.
2013-11-15 11:04:02 +01:00
062810caed
Show active driver in docker info output
2013-11-15 10:24:48 +01:00
0c38f86e5e
Merge pull request #32 from shykes/shykes-0.6.5-dm-plugin
...
Merge bug fix from dotcloud/docker master
2013-11-14 16:21:19 -08:00
8a358e8833
Merge branch 'master' into shykes-0.6.5-dm-plugin
2013-11-14 16:18:33 -08:00
84ed18827a
Merge pull request #2704 from shykes/fix-auto-pull
...
Fix the brittle errorstring-to-httperror recognition code
2013-11-14 16:15:46 -08:00
693ff4d2ae
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)
2013-11-14 23:54:28 +00:00
eb06a7b8f8
Merge pull request #31 from shykes/shykes-0.6.5-dm-plugin
...
Merge from dotcloud/docker master
2013-11-14 14:14:13 -08:00
7cf60da388
Merge branch 'master' into shykes-0.6.5-dm-plugin
...
Conflicts:
utils.go
utils_test.go
2013-11-14 14:02:44 -08:00
eace2dbe1d
Merge branch 'dm-plugin-new-ChangesDirs' of https://github.com/alexlarsson/docker into alexlarsson-dm-plugin-new-ChangesDirs
...
Conflicts:
archive/changes.go
2013-11-14 12:23:01 -08:00
629c6e3649
Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm
...
Fix lxc start for shared root filesystems
2013-11-14 11:20:53 -08:00
c7aaf831d7
Merge pull request #2691 from SvenDowideit/add-instruction-path-limitations
...
except URL-based ADDs
2013-11-14 11:12:08 -08:00
099c53b28e
Merge pull request #29 from crosbymichael/try-load-aufs
...
Try to load aufs first then check in filesystems for aufs support
2013-11-14 10:11:19 -08:00
7b2d59b91e
Try to load aufs first then check in filesystems for aufs support
2013-11-14 09:42:12 -08:00
529c30261e
Merge pull request #28 from crosbymichael/close-sparse-files
...
Close sparse files when done
2013-11-14 07:02:47 -08:00
e42144674f
thankyou @tomdz - I forgot about URL based ADDs
2013-11-14 14:53:55 +10:00
61abc3f8ac
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.
2013-11-13 18:31:21 -08:00
5fc56b6b47
Merge pull request #2661 from rogaha/links_docs
...
- Added a doc about Links and Container Naming
2013-11-13 18:15:25 -08:00
bbc9fc7907
Close sparse files when done
2013-11-13 17:05:32 -08:00
7682ec04cd
Merge pull request #27 from shykes/refactor_dm
...
Add more dm unit tests
2013-11-13 16:50:26 -08:00
590465b395
Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm
2013-11-13 16:47:37 -08:00
05d70cbcf4
More dm unit tests
2013-11-13 16:46:10 -08:00
9ab85f4d12
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!)
2013-11-13 16:09:23 -08:00
539708aa8a
Merge pull request #26 from shykes/refactor_dm
...
Refactor dm
2013-11-13 15:45:58 -08:00
3aaef96e36
Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm
2013-11-13 15:44:13 -08:00
921e2e9ae2
Merge pull request #25 from crosbymichael/add-aufs-diff-test
...
Add test for ApplyDiff
2013-11-13 15:43:26 -08:00
b50838c359
Merge pull request #24 from crosbymichael/dm-tests
...
Add device mapper tests for driver.go
2013-11-13 15:41:59 -08:00
4bebca848e
Add devmapper_test.go
2013-11-13 15:35:52 -08:00
6b3dd02bb8
Add test coverage for devicemapper driver.go
2013-11-13 14:56:26 -08:00
80e7319558
Make sure setInitialized is called when device is mounted
2013-11-13 14:54:47 -08:00
1d188c8737
Create devmapper_wrapper.go
2013-11-13 14:36:31 -08:00
3cf23b93ea
Merge pull request #2679 from FreekKalter/master
...
fix error in python webapp example
2013-11-13 13:35:01 -08:00
3ba6835ead
Merge pull request #2676 from tianon/go1.2rc4
...
Update to go1.2rc4
2013-11-13 11:45:56 -08:00
dc13b9473f
Merge pull request #2686 from shykes/gofmt
...
gofmt
2013-11-13 11:35:37 -08:00
b00d5f0185
gofmt
2013-11-13 19:25:55 +00:00
8e71391572
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
2013-11-13 11:17:54 -08:00
a69d86e0b1
Add test for ApplyDiff
2013-11-13 11:03:56 -08:00
077c2496ed
Merge pull request #2681 from SvenDowideit/add-instruction-path-limitations
...
add a little more info about the limitations of ADD wrt ../ and docker build
2013-11-13 10:56:35 -08:00
46ab7d1e8a
Merge pull request #15 from alexlarsson/dm-plugin-explicit-init
...
Remove devicemapper lazy initialization
2013-11-13 10:46:24 -08:00
b94e9ed0de
Merge pull request #2652 from tianon/upstart-defaults-too
...
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
2013-11-13 10:42:41 -08:00
e3597624dd
Merge pull request #23 from crosbymichael/ignore-dir-sizes
...
Ignore dir sizes in TreeSize func
2013-11-13 10:40:03 -08:00
a4f14528c2
Ignore dir sizes in TreeSize func
2013-11-13 10:33:24 -08:00
c964494d31
Merge pull request #2673 from shykes/engine-patch-2
...
* Engine: expand the engine API with 'create' and 'start' jobs Edit
2013-11-13 10:14:56 -08:00
c6e83b8779
Merge pull request #2656 from shykes/export-restrictions-debian
...
Change crypto export notice to meet Debian requirements
2013-11-13 09:37:23 -08:00
369e39aea1
Merge pull request #2680 from inglesp/patch-1
...
Typo in ROADMAP.md
2013-11-13 09:19:37 -08:00
af0b2e38c3
add a little more info about the limitations of ADD wrt ../ and docker build -
2013-11-13 22:55:55 +10:00
87b4bb9fcc
Typo in ROADMAP.md
2013-11-13 12:32:49 +00:00
f5e6c2d060
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.
2013-11-13 13:20:38 +01:00
f0f8462d18
update the v1.7 API to reflect the case change in the /index/search response, and note that its to align better with the registry server response that its proxying
2013-11-13 22:11:20 +10:00
8523d5518c
Update to go1.2rc4
2013-11-12 21:51:12 -07:00
6c4393ccbb
Merge branch 'job-create-start-clean' into engine-patch-2
...
Conflicts:
engine/engine.go
engine/job.go
server.go
utils_test.go
2013-11-13 00:36:20 +00:00
Alexander Larsson