Michael Crosby
4908d7f81d
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
2013-11-14 22:53:59 -08:00
Michael Crosby
29fa1b6666
Unlink docker init files
2013-11-14 21:23:23 -08:00
Andy Rothfusz
bed87ea103
Merge pull request #2690 from codevin/master
...
Improvise documentation for builder.rst / VOLUME command
2013-11-14 19:23:18 -08:00
Solomon Hykes
823674816e
Move iptables test to integration tests
2013-11-15 01:15:39 +00:00
Solomon Hykes
8d3e35cd8d
Split auth tests between unit tests and integration tests
2013-11-15 01:13:20 +00:00
Michael Crosby
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
Guillaume J. Charmes
8a358e8833
Merge branch 'master' into shykes-0.6.5-dm-plugin
2013-11-14 16:18:33 -08:00
Guillaume J. Charmes
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
Solomon Hykes
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
Victor Vieux
596810d8db
move TestMount to integration
2013-11-14 15:17:31 -08:00
Victor Vieux
661a8a0e0c
fix Integration tests
2013-11-14 14:46:13 -08:00
Michael Crosby
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
Guillaume J. Charmes
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
Alexander Larsson
006e2a600c
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.
2013-11-14 22:56:18 +01:00
Michael Crosby
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
Michael Crosby
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
Andy Rothfusz
c7aaf831d7
Merge pull request #2691 from SvenDowideit/add-instruction-path-limitations
...
except URL-based ADDs
2013-11-14 11:12:08 -08:00
Solomon Hykes
e9624bf715
Remove deprecated tags_test.go
2013-11-14 10:50:43 -08:00
Solomon Hykes
2a209afe5f
gofmt
2013-11-14 10:50:43 -08:00
Victor Vieux
c001a5af67
Integration tests: remove dependency on private APIs
2013-11-14 10:50:43 -08:00
Solomon Hykes
359a6f49b9
Move integration tests to integration/, expose missing public methods in the core
2013-11-14 10:50:00 -08:00
Solomon Hykes
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
Michael Crosby
7b2d59b91e
Try to load aufs first then check in filesystems for aufs support
2013-11-14 09:42:12 -08:00
Guillaume J. Charmes
529c30261e
Merge pull request #28 from crosbymichael/close-sparse-files
...
Close sparse files when done
2013-11-14 07:02:47 -08:00
Frederick F. Kautz IV
7267c4b746
Removing sudo
2013-11-14 05:53:53 +00:00
Frederick F. Kautz IV
26533eb2c4
Adding a makefile
2013-11-14 05:34:25 +00:00
¨Sven
e42144674f
thankyou @tomdz - I forgot about URL based ADDs
2013-11-14 14:53:55 +10:00
Vinod Kulkarni
37abc07852
Improvise documentation for builder.rst / VOLUME command
2013-11-14 09:54:31 +05:30
Andy Rothfusz
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
Andy Rothfusz
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
Andy Rothfusz
059950b095
Clean up sphinx syntax, upgrade http markup package, minor link changes, update intro.
2013-11-13 17:45:22 -08:00
Michael Crosby
bbc9fc7907
Close sparse files when done
2013-11-13 17:05:32 -08:00
Michael Crosby
7682ec04cd
Merge pull request #27 from shykes/refactor_dm
...
Add more dm unit tests
2013-11-13 16:50:26 -08:00
Guillaume J. Charmes
590465b395
Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm
2013-11-13 16:47:37 -08:00
Guillaume J. Charmes
05d70cbcf4
More dm unit tests
2013-11-13 16:46:10 -08:00
Thatcher Peskens
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
Michael Crosby
539708aa8a
Merge pull request #26 from shykes/refactor_dm
...
Refactor dm
2013-11-13 15:45:58 -08:00
Guillaume J. Charmes
3aaef96e36
Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm
2013-11-13 15:44:13 -08:00
Guillaume J. Charmes
921e2e9ae2
Merge pull request #25 from crosbymichael/add-aufs-diff-test
...
Add test for ApplyDiff
2013-11-13 15:43:26 -08:00
Guillaume J. Charmes
b50838c359
Merge pull request #24 from crosbymichael/dm-tests
...
Add device mapper tests for driver.go
2013-11-13 15:41:59 -08:00
Guillaume J. Charmes
4bebca848e
Add devmapper_test.go
2013-11-13 15:35:52 -08:00
Michael Crosby
6b3dd02bb8
Add test coverage for devicemapper driver.go
2013-11-13 14:56:26 -08:00
Michael Crosby
80e7319558
Make sure setInitialized is called when device is mounted
2013-11-13 14:54:47 -08:00
Guillaume J. Charmes
1d188c8737
Create devmapper_wrapper.go
2013-11-13 14:36:31 -08:00
Andy Rothfusz
3cf23b93ea
Merge pull request #2679 from FreekKalter/master
...
fix error in python webapp example
2013-11-13 13:35:01 -08:00
Guillaume J. Charmes
3ba6835ead
Merge pull request #2676 from tianon/go1.2rc4
...
Update to go1.2rc4
2013-11-13 11:45:56 -08:00
Guillaume J. Charmes
dc13b9473f
Merge pull request #2686 from shykes/gofmt
...
gofmt
2013-11-13 11:35:37 -08:00
Solomon Hykes
b00d5f0185
gofmt
2013-11-13 19:25:55 +00:00
Andy Rothfusz
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
Michael Crosby
a69d86e0b1
Add test for ApplyDiff
2013-11-13 11:03:56 -08:00
