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
12e993549d
Fix unit-tests
2013-11-19 15:24:14 -08:00
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
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
85b5062502
Merge pull request #44 from crosbymichael/container-migration
...
Container and Image migration for aufs
2013-11-19 13:47:23 -08:00
66beafa9f3
rename file to remove testing flags from docker binary
2013-11-19 12:41:29 -08:00
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
8e5ab5bfca
improve tests on the engine
2013-11-19 11:47:47 -08:00
9d867a389b
Merge pull request #2759 from dotcloud/lintify-1
...
Lintify code with confidence=1
2013-11-19 11:26:15 -08:00
4f9f83d6c6
Fix #2342 . Harmonize information about ADD. Cross-link build info.
2013-11-19 11:16:28 -08:00
145c2008ae
speedup docker ps
2013-11-19 11:02:10 -08:00
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
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
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
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
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
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
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
1da8c50ded
Fix quote mistake.
2013-11-19 12:14:39 -05:00
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
f78d45863c
Merge pull request #2734 from zitrusmedia/master
...
Vagrantfile modified to support VBoxGuestAdditions_4.3.2
2013-11-19 09:04:28 -08:00
3656db66d2
fixed typos, and made small improvements to the wording
2013-11-19 14:44:50 +01:00
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
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
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
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
51a972f38d
Rename AufsDriver to Driver to be consistent
2013-11-19 03:27:59 -08:00
aea6001baf
Check env var for setting driver in tests
2013-11-19 03:13:22 -08:00
6dbeed89c0
Add flag to set default graph driver
...
Remove the env var DOCKER_DRIVER
2013-11-19 02:37:44 -08:00
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
9415c2b1f0
Move docker-device-tool to contrib
2013-11-19 10:03:04 +01:00
a0224e61b4
devicemapper tool: Add support for pool resizing
2013-11-19 09:59:13 +01:00
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
80aecc7014
devmapper: Update device-mapper-tool
...
This makes the device mapper tool work again and adds new features
to get pool status, device status and to list all devices.
2013-11-19 09:44:19 +01:00
3edb4af663
Ensure same atime, mtime after applying whiteouts
2013-11-19 00:35:03 -08:00
00401a30b7
devmapper: Use a "rootfs" subdirectory in the devmapper volume
...
We place the actual image/containers in the "rootfs" directory, which
allows us to have other data in the toplevel directory in the mount.
For starters, this means the "lost+found" directory from mkfs will
not always be in your container/image.
Secondly, we can create a file "id" in the toplevel dir which is not
visible from the container. This is useful because it allows us to map
back from the device fs to the container if something goes wrong with
the devicemapper metadata.
2013-11-19 09:29:42 +01:00
5ee8e41e43
Retry moving dirs on every daemon startup
...
This will try to move the directories that were
previously symlinked until a full migration is complete.
2013-11-18 23:28:45 -08:00
29f07f8544
Add container migration to aufs driver
2013-11-18 18:39:21 -08:00
2fe4467d73
Do ont truncate ID on docker rmi
2013-11-18 18:39:02 -08:00
194d4b9376
Correct the quotations in the command to add the -r=false flag. Thanks to @tianon for pointing this out.
2013-11-18 21:23:00 -05:00
1de02a70de
Merge pull request #2719 from metalivedev/2702-knownissue-lxc-start-failed-to-mount
...
Fixes #2702 . Also cleans up formatting and long lines in volumes doc.
2013-11-18 17:27:49 -08:00
5e941f1ca0
Lintify code with confidence=1
2013-11-18 16:24:11 -08:00
f88b760809
Migrate images with parent relationship
2013-11-18 16:17:43 -08:00
511a62a099
Merge pull request #2755 from metalivedev/test-2592
...
Replace PR#2592
2013-11-18 15:29:48 -08:00
256d46fe68
Merge pull request #2721 from metalivedev/2701-addmedia
...
Add security section and embed private registry video.
2013-11-18 15:29:35 -08:00
76ee860ece
Simplify the upstart example in host_integration.rst
...
Taking some pointers from @tianon on my pull request #2685 .
2013-11-18 16:21:03 -05:00
94e854823f
Use tryRelocate to fall back to symlink if rename fails
2013-11-18 13:16:28 -08:00
e42b574579
Merge pull request #42 from alexlarsson/dm-plugin-archive-test-skip
...
Mark archive.TestApplyLayer as skipped
2013-11-18 13:10:39 -08:00
2ae1f29dfe
Fixes #2702 . Also cleans up formatting and long lines in volumes doc.
2013-11-18 13:09:13 -08:00
4b80ec9aae
test: remove extra args in TestExitCode
...
The extra blank argument isn't needed and confuses libvirt.
2013-11-18 15:07:11 -06:00
Michael Crosby
Guillaume J. Charmes
Victor Vieux
Tianon Gravi
Josh Poimboeuf
Victor Vieux
Andy Rothfusz
Vitor Monteiro
Ryan Seto
Daniel Mizyrycki
Sylvain Bellemare
Alexander Larsson
unclejack
Guillaume J. Charmes