Frederick F. Kautz IV
61a8020e51
Adding version info, switching to defer for cleanup
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
7eaa59f626
Offline Image Transfers #1155
2013-11-20 03:52:33 +00:00
Michael Crosby
2cccbbdadd
Pip python deps to a specific version
2013-11-19 19:25:54 -08:00
Michael Crosby
24586d7af5
Merge pull request #54 from shykes/vieux_merge_master
...
Merge from master
2013-11-19 18:38:15 -08:00
Victor Vieux
b700ee006a
Merge pull request #2777 from dotcloud/fix_port_stop_start
...
don't import emport empty hostconfig
2013-11-19 18:36:22 -08:00
Victor Vieux
880a0e9c36
Merge branch 'master' into vieux_merge_master
2013-11-19 18:34:19 -08:00
Victor Vieux
0169cf15dd
don't import emport empty hostconfig
2013-11-19 18:28:50 -08:00
Victor Vieux
cd022376b8
Merge branch 'master' into vieux_merge_master
...
Conflicts:
runtime.go
2013-11-19 17:32:08 -08:00
Michael Crosby
234f5ac39f
Merge pull request #2750 from jpoimboe/simplify-register-reconnect
...
Simplify the runtime Register reconnect logic
2013-11-19 17:30:59 -08:00
Michael Crosby
d4ef551d65
Merge pull request #53 from shykes/improve_cleanup
...
Improve aufs cleanup and debugging
2013-11-19 17:16:36 -08:00
Victor Vieux
76f54f3a28
Merge pull request #39 from crosbymichael/add-driver-flag
...
Add flag to set default graph driver
2013-11-19 17:16:25 -08:00
Victor Vieux
43b709ab36
Merge pull request #52 from crosbymichael/rename-aufs-driver
...
Rename AufsDriver to Driver to be consistent
2013-11-19 17:13:44 -08:00
Victor Vieux
43899a77bf
improve aufs cleanup and debugging
2013-11-19 17:12:37 -08:00
Victor Vieux
d575918038
Merge pull request #2748 from jpoimboe/fix-restart-race-condition
...
fix container restart race condition
2013-11-19 16:26:13 -08:00
Guillaume J. Charmes
f6629bbbd5
Merge pull request #50 from crosbymichael/limit-dm
...
Prohibit more than 42 layers in the core
2013-11-19 15:42:00 -08:00
Guillaume J. Charmes
91330243b5
Merge pull request #48 from crosbymichael/reset-mtime
...
Ensure same atime, mtime after applying whiteouts
2013-11-19 15:40:12 -08:00
Guillaume J. Charmes
3e0a5ac48b
Merge pull request #41 from alexlarsson/dm-plugin-device-tool
...
Update docker-device-tool
2013-11-19 15:38:47 -08:00
Michael Crosby
0d603df6dc
Merge pull request #49 from shykes/creack-merge-master
...
Merge master into 0.6.5-dm-plugin
2013-11-19 15:29:09 -08:00
Guillaume J. Charmes
12e993549d
Fix unit-tests
2013-11-19 15:24:14 -08:00
Guillaume J. Charmes
28d4cbbc59
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
2013-11-19 14:58:12 -08:00
Victor Vieux
5a4113140e
Merge pull request #43 from alexlarsson/dm-plugin-use-root-subdir
...
devmapper: Use a "root" subdirectory in the devmapper volume
2013-11-19 13:51:04 -08:00
Victor Vieux
85b5062502
Merge pull request #44 from crosbymichael/container-migration
...
Container and Image migration for aufs
2013-11-19 13:47:23 -08:00
Tianon Gravi
66beafa9f3
rename file to remove testing flags from docker binary
2013-11-19 12:41:29 -08:00
Josh Poimboeuf
3cbec95177
simplify the runtime Register reconnect logic
...
Refactor the Register code a little bit to make it easier to comprehend.
2013-11-19 14:09:30 -06:00
Victor Vieux
8e5ab5bfca
improve tests on the engine
2013-11-19 11:47:47 -08:00
Michael Crosby
9d867a389b
Merge pull request #2759 from dotcloud/lintify-1
...
Lintify code with confidence=1
2013-11-19 11:26:15 -08:00
Andy Rothfusz
4f9f83d6c6
Fix #2342 . Harmonize information about ADD. Cross-link build info.
2013-11-19 11:16:28 -08:00
Victor Vieux
145c2008ae
speedup docker ps
2013-11-19 11:02:10 -08:00
Andy Rothfusz
4eaba8de91
Merge pull request #2757 from Painted-Fox/patch-2
...
Simplify the upstart example in host_integration.rst
2013-11-19 10:29:54 -08:00
Andy Rothfusz
434c1613a4
Merge pull request #2770 from tianon/better-man-page
...
Switch sphinx man_pages generation to use commandline/cli
2013-11-19 10:28:50 -08:00
Andy Rothfusz
18da26c62a
Merge pull request #2766 from sbellem/doc-improvements
...
fixed typos, and made small improvements to the wording
2013-11-19 10:27:25 -08:00
Michael Crosby
4c2624a277
Merge pull request #45 from alexlarsson/dm-plugin-diff-size
...
Implement fallback for getting the size of a container
2013-11-19 10:25:31 -08:00
Michael Crosby
f4b3b7c055
Merge pull request #47 from alexlarsson/dm-plugin-ummount-when-removing
...
Devicemapper: Unmount when removing device
2013-11-19 10:24:44 -08:00
Michael Crosby
9af1b07086
Merge pull request #46 from alexlarsson/dm-plugin-dummy-use-cp
...
Dummy driver: Use cp --reflink=auto to copy directories
2013-11-19 10:16:56 -08:00
Vitor Monteiro
aeb304b37c
Change to documentation for AWS AMI request
...
Hi guys, it just might be me, but clicking the AMI from http://cloud-images.ubuntu.com/locator/ec2/ is broken to me. So I just did it via the normal Create Instance Wizard.
I just though some people might have the same issue.
Sorry if my markdown for links is screwed up, I went by the examples, since I'm used to the `[]()` traditional one.
Cheers.
2013-11-19 17:50:38 +00:00
Ryan Seto
1da8c50ded
Fix quote mistake.
2013-11-19 12:14:39 -05:00
Tianon Gravi
1cd9529ad3
Switch sphinx man_pages generation to use commandline/cli instead of toctree for a more relevant/useful man page
2013-11-19 10:10:42 -07:00
Daniel Mizyrycki
f78d45863c
Merge pull request #2734 from zitrusmedia/master
...
Vagrantfile modified to support VBoxGuestAdditions_4.3.2
2013-11-19 09:04:28 -08:00
Sylvain Bellemare
3656db66d2
fixed typos, and made small improvements to the wording
2013-11-19 14:44:50 +01:00
Alexander Larsson
0ed762f2d2
devicemapper: Unmount when removing device
...
Without this the remove will fail due to a busy device.
2013-11-19 14:40:15 +01:00
Alexander Larsson
242fd4b3ef
dummy driver: Use cp --reflink=auto to copy directories
...
On systems that supports reflinking (i.e. btrfs) this means the dummy
backend is much faster at copying files and will be sharing file data in
a CoW fashion.
On my (btrfs) system this makes "docker run ubuntu echo hello world" go
from about 3 seconds to about 1 second. Not instant, but clearly better.
cp --reflink=auto is availible since coreutils 7.5 (around 2009), so this
seems pretty ok to rely on.
cp is also better at preserving file metadata than tar, so for instance
it will copy xattrs.
2013-11-19 13:09:36 +01:00
unclejack
78c843c8ef
fix container size computation: handle hard links
...
This change makes docker compute container size correctly.
The old code isn't taking hard links into account. Containers could
seem like they're up to 1-1.5x larger than they really were.
2013-11-19 13:53:34 +02:00
unclejack
ac821f2446
fix layer size computation: handle hard links
...
This change makes docker compute layer size correctly.
The old code isn't taking hard links into account. Layers could
seem like they're up to 1-1.5x larger than they really were.
2013-11-19 13:37:54 +02:00
Michael Crosby
51a972f38d
Rename AufsDriver to Driver to be consistent
2013-11-19 03:27:59 -08:00
Michael Crosby
aea6001baf
Check env var for setting driver in tests
2013-11-19 03:13:22 -08:00
Michael Crosby
6dbeed89c0
Add flag to set default graph driver
...
Remove the env var DOCKER_DRIVER
2013-11-19 02:37:44 -08:00
Alexander Larsson
5d76681c3d
Implement fallback for getting the size of a container
...
This moves Driver.Size() to Differ.DiffSize(), removing the empty
implementations in devmapper and dummy, and renaming the one in aufs.
Then we fall back to a container.Changes() implementation in the non-aufs
case.
2013-11-19 10:36:54 +01:00
Alexander Larsson
9415c2b1f0
Move docker-device-tool to contrib
2013-11-19 10:03:04 +01:00
Alexander Larsson
a0224e61b4
devicemapper tool: Add support for pool resizing
2013-11-19 09:59:13 +01:00
Michael Crosby
af753cbad8
Prohibit more than 42 layers in the core
...
We need to do this because we still support aufs
and users on other drivers can push incompat images
to the registory that aufs users cannot use.
2013-11-19 00:51:16 -08:00