Commit Graph

4692 Commits

Author SHA1 Message Date
791d32523f Fix #2342. Harmonize information about ADD. Cross-link build info.
Upstream-commit: 4f9f83d6c6e71f826489f04e497f4a384c49a2c1
Component: engine
2013-11-19 11:16:28 -08:00
d8912e66aa speedup docker ps
Upstream-commit: 145c2008ae3bbd8bca6e11bac93c6c0098a3ba42
Component: engine
2013-11-19 11:02:10 -08:00
f37e981fe7 Merge pull request #2757 from Painted-Fox/patch-2
Simplify the upstart example in host_integration.rst
Upstream-commit: 4eaba8de918c384a782f181122c333fa7bd14857
Component: engine
2013-11-19 10:29:54 -08:00
7d3676e536 Merge pull request #2770 from tianon/better-man-page
Switch sphinx man_pages generation to use commandline/cli
Upstream-commit: 434c1613a42661014147c21fe22867f6faa0a901
Component: engine
2013-11-19 10:28:50 -08:00
2d625fbded Merge pull request #2766 from sbellem/doc-improvements
fixed typos, and made small improvements to the wording
Upstream-commit: 18da26c62a2b4dc749a9c4074efcca32cc4b0573
Component: engine
2013-11-19 10:27:25 -08:00
a68204dea9 Merge pull request #45 from alexlarsson/dm-plugin-diff-size
Implement fallback for getting the size of a container
Upstream-commit: 4c2624a277195c9a0d6fabca29cf3a769e1e6482
Component: engine
2013-11-19 10:25:31 -08:00
3f203284a9 Merge pull request #47 from alexlarsson/dm-plugin-ummount-when-removing
Devicemapper: Unmount when removing device
Upstream-commit: f4b3b7c0553dbd474e258dc1fa01d7b96c900887
Component: engine
2013-11-19 10:24:44 -08:00
7600b7d415 Merge pull request #46 from alexlarsson/dm-plugin-dummy-use-cp
Dummy driver: Use cp --reflink=auto to copy directories
Upstream-commit: 9af1b0708656b6870dbc89ad2ab860be8c6b65ad
Component: engine
2013-11-19 10:16:56 -08:00
e6a444ec3b 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.
Upstream-commit: aeb304b37c190e7fab60c0db946d1fd5d8e9e9f3
Component: engine
2013-11-19 17:50:38 +00:00
8dfcb6d8f5 Fix quote mistake.
Upstream-commit: 1da8c50deddde692c1f87aec86c20cd3c2c3fd11
Component: engine
2013-11-19 12:14:39 -05:00
a9304e452b Switch sphinx man_pages generation to use commandline/cli instead of toctree for a more relevant/useful man page
Upstream-commit: 1cd9529ad350f70aaf6627368bdc8d007b90b3e4
Component: engine
2013-11-19 10:10:42 -07:00
b456131081 Merge pull request #2734 from zitrusmedia/master
Vagrantfile modified to support VBoxGuestAdditions_4.3.2
Upstream-commit: f78d45863cb285e45edd427a958962421d3832f2
Component: engine
2013-11-19 09:04:28 -08:00
3ec0757555 fixed typos, and made small improvements to the wording
Upstream-commit: 3656db66d2f13d74e07574d229b32023bb11dc1f
Component: engine
2013-11-19 14:44:50 +01:00
f13b8265b6 devicemapper: Unmount when removing device
Without this the remove will fail due to a busy device.
Upstream-commit: 0ed762f2d2ff613052b81d06509dac06b13fc0c9
Component: engine
2013-11-19 14:40:15 +01:00
5e0d1fa18e 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.
Upstream-commit: 242fd4b3ef32b5a20135d6031040bcf099b5df4e
Component: engine
2013-11-19 13:09:36 +01:00
fa7c88b484 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.
Upstream-commit: 78c843c8eff64da5e12725bdb111b18e51d82606
Component: engine
2013-11-19 13:53:34 +02:00
e1cbb6a909 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.
Upstream-commit: ac821f2446628a9151587038f1d377f57985a452
Component: engine
2013-11-19 13:37:54 +02:00
a07b5796a9 Rename AufsDriver to Driver to be consistent
Upstream-commit: 51a972f38d0b6e2e7a4b27509b58fc7a6e92679f
Component: engine
2013-11-19 03:27:59 -08:00
2a2c0a4cdc Check env var for setting driver in tests
Upstream-commit: aea6001baf0cd0fb20a607e37e4379bf644b28fd
Component: engine
2013-11-19 03:13:22 -08:00
c8cec50adf Add flag to set default graph driver
Remove the env var DOCKER_DRIVER
Upstream-commit: 6dbeed89c061b85551ab638f93282d87de8ab929
Component: engine
2013-11-19 02:37:44 -08:00
99bee9426b 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.
Upstream-commit: 5d76681c3d0cbb744205a397420603ce029ce754
Component: engine
2013-11-19 10:36:54 +01:00
339d427535 Move docker-device-tool to contrib
Upstream-commit: 9415c2b1f08ecd168ab5a620a80a5bed34df8adb
Component: engine
2013-11-19 10:03:04 +01:00
90396dc0fc devicemapper tool: Add support for pool resizing
Upstream-commit: a0224e61b48e1dd1378cb955596fba1937e99068
Component: engine
2013-11-19 09:59:13 +01:00
d0deac1a2c 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.
Upstream-commit: af753cbad8957f8c51852fdc26a25a8e43114938
Component: engine
2013-11-19 00:51:16 -08:00
08c42330ce 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.
Upstream-commit: 80aecc70141f3e7b3138752bf3f0c33b9a273714
Component: engine
2013-11-19 09:44:19 +01:00
04ef2191af Ensure same atime, mtime after applying whiteouts
Upstream-commit: 3edb4af663079ad79672bc98fcd20790f8fb2589
Component: engine
2013-11-19 00:35:03 -08:00
8ad4e865dc 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.
Upstream-commit: 00401a30b73d897255b7b99996d7c6a53fe2d4af
Component: engine
2013-11-19 09:29:42 +01:00
9820e0b026 Retry moving dirs on every daemon startup
This will try to move the directories that were
previously symlinked until a full migration is complete.
Upstream-commit: 5ee8e41e43892694f66b4d6d01ed95f4ca2e7cb6
Component: engine
2013-11-18 23:28:45 -08:00
2d65b723cd Add container migration to aufs driver
Upstream-commit: 29f07f854497571db570be79c8df878624f5b41c
Component: engine
2013-11-18 18:39:21 -08:00
3768669ba5 Do ont truncate ID on docker rmi
Upstream-commit: 2fe4467d73b1bfe4a64011ee9d6b6aaf8b244fa5
Component: engine
2013-11-18 18:39:02 -08:00
e445caadb0 Correct the quotations in the command to add the -r=false flag. Thanks to @tianon for pointing this out.
Upstream-commit: 194d4b93768c49f0d76a5da8943446efbea879ca
Component: engine
2013-11-18 21:23:00 -05:00
d87c69acdb 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.
Upstream-commit: 1de02a70dea3249413da4a06a205d7d9c98145aa
Component: engine
2013-11-18 17:27:49 -08:00
6e0c243c2e Lintify code with confidence=1
Upstream-commit: 5e941f1ca035bb1ec014c18d277aecaa41deba85
Component: engine
2013-11-18 16:24:11 -08:00
3688213d04 Migrate images with parent relationship
Upstream-commit: f88b760809677109a723f25399f738d756f14c13
Component: engine
2013-11-18 16:17:43 -08:00
f783d46575 Merge pull request #2755 from metalivedev/test-2592
Replace PR#2592
Upstream-commit: 511a62a099ee086b6472816703a3e247d42f2127
Component: engine
2013-11-18 15:29:48 -08:00
2b588f2557 Merge pull request #2721 from metalivedev/2701-addmedia
Add security section and embed private registry video.
Upstream-commit: 256d46fe68e0faaab8efc3101ece2260a009e2af
Component: engine
2013-11-18 15:29:35 -08:00
5a2e995ad5 Simplify the upstart example in host_integration.rst
Taking some pointers from @tianon on my pull request #2685.
Upstream-commit: 76ee860ece15f8a7738c503fdd73f124f0ef1f4b
Component: engine
2013-11-18 16:21:03 -05:00
80e02fbc62 Use tryRelocate to fall back to symlink if rename fails
Upstream-commit: 94e854823f3549eeddaafa24835093966d9aaeeb
Component: engine
2013-11-18 13:16:28 -08:00
d1fa68fd69 Merge pull request #42 from alexlarsson/dm-plugin-archive-test-skip
Mark archive.TestApplyLayer as skipped
Upstream-commit: e42b5745797a63608e63f9985cc2547c3b68ed69
Component: engine
2013-11-18 13:10:39 -08:00
814f2e1b4e Fixes #2702. Also cleans up formatting and long lines in volumes doc.
Upstream-commit: 2ae1f29dfe6fea26d2e0ac29faa2375a5db2c2d9
Component: engine
2013-11-18 13:09:13 -08:00
c4cad6571f test: remove extra args in TestExitCode
The extra blank argument isn't needed and confuses libvirt.
Upstream-commit: 4b80ec9aae2f43e831de64f3746c7838252e9203
Component: engine
2013-11-18 15:07:11 -06:00
ef3400502c test: fix TestRmi race condition
Upstream-commit: fef41ef7bf83ed04c7df8e0247e60c0d495eefdc
Component: engine
2013-11-18 15:07:06 -06:00
9af9f8999c Merge pull request #2718 from dotcloud/fix_tmp_dir_never_cleanup
Fix tmp dir never cleanup
Upstream-commit: f946a486ea3cdb56c771a37da281ad223b5042f8
Component: engine
2013-11-18 12:20:23 -08:00
3aad2aef64 Merge pull request #2743 from tianon/go1.2rc5
Update to go1.2rc5
Upstream-commit: e008c7c0685ea43861b61a6e5e4509516707e967
Component: engine
2013-11-18 12:11:56 -08:00
29163ad063 Merge pull request #2729 from SvenDowideit/docker-info-doc
add example for docker info
Upstream-commit: 669e4bac30f41c2bebbcae2889fb1420cd41af37
Component: engine
2013-11-18 11:44:54 -08:00
28e01f39d4 Merge pull request #2726 from SvenDowideit/docker-history-doc
add example for docker history
Upstream-commit: f6362fbb0ee00aa2a7ac6ca21f8ba1004a135b4c
Component: engine
2013-11-18 11:43:44 -08:00
0af8e75a2b Merge pull request #2742 from rick/patch-1
Tiny typo cleanup
Upstream-commit: c1cd8245709da81e5633145a8e6991eee336c555
Component: engine
2013-11-18 11:37:37 -08:00
00d1972d8e Merge pull request #2752 from dotcloud/gofmt_test
Go fmt tests
Upstream-commit: 4546832507694fc675fe1604b219de25d454cd35
Component: engine
2013-11-18 11:34:59 -08:00
ab58212aa6 Merge pull request #2724 from SvenDowideit/docker-diff-example
add an example of what to expect from docker diff, and what the 3 codes mean
Upstream-commit: b5934711d06331d911447d87146ec539da397a77
Component: engine
2013-11-18 11:34:05 -08:00
e0cb0011ff gofmt_test
Upstream-commit: ed8f75d25ca0fb46d8c06bfe74bbc386bf4e8a8f
Component: engine
2013-11-18 11:25:13 -08:00