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
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
73f468d678
Merge pull request #2749 from jpoimboe/dont-forward-SIGCHLD
...
Do not forward SIGCHLD to container
Upstream-commit: cfbd9ea16dd9ef421f7d6f7d1ed325c7d070eeb3
Component: engine
2013-11-18 11:24:08 -08:00
6c91c91066
More informative error message on name collisions
...
This is the proposed fix for #2506 . It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.
I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
Upstream-commit: 3c67a2849337f3b9bd92dd389f0e02e48a36028b
Component: engine
2013-11-18 17:51:47 +00:00
4070c845dc
don't forward SIGCHLD to container
...
It makes no sense to forward SIGCHLD to the container.
Upstream-commit: 440422a96346072a0a9016c4db78ff7599a702aa
Component: engine
2013-11-18 11:45:29 -06:00
4d58ddf15b
fix container restart race condition
...
Finish container cleanup before setting the state to stopped.
Otherwise, for an application that exits quickly, a call to Restart
can allow Start to be called again before cleanup is done, resulting in
overritten data in the Container struct.
Upstream-commit: fc2f5758cf22fe5d3d46be7e4642abc0735e2c8d
Component: engine
2013-11-18 11:42:30 -06:00
0c60a3c3a0
test: 2 second timeout (not 2000)
...
Upstream-commit: fe302fbfd26fc7db5d751d4bec8a0bd4ce6030a4
Component: engine
2013-11-18 10:23:30 -06:00
b0f8db9d1b
test: skip TestCreate on Fedora due to lxc utils bug
...
In the dind environment running on a Fedora host, the lxc utils get
confused by the /sys/fs/cgroup/cpuacct,cpu cgroup mount and lxc-start
fails trying to access the wrong cgroup directory.
Upstream-commit: 72d02ecdde2ba6f39739a0a942f2c4a057b4d45f
Component: engine
2013-11-18 10:23:30 -06:00
4527e73586
test: fix TestCreateStartRestartStopStartKillRm
...
cat needs stdin opened, otherwise it dies immediately.
Upstream-commit: baa687bed2f1f9ee6e44c70d95baad8757ac529c
Component: engine
2013-11-18 10:23:30 -06:00
ed492661bb
test: put each arg in a separate string
...
Each arg to docker run should be placed in a separate string.
Otherwise, when starting the command via exec.Cmd, the command is
interpreted as "echo test", which can't be found.
Upstream-commit: 30ea0bebce340dfc257b5b45835234cb921f3a48
Component: engine
2013-11-18 10:23:06 -06:00
63db5cd7f5
Mark archive.TestApplyLayer as skipped
...
Instead of just returning we call Skip to log that the test
was skipped.
Upstream-commit: 8ed4307f50b93d7c49eccf30357a4b9d3fbb1376
Component: engine
2013-11-18 14:31:34 +01:00
6f7d08bf45
Update to go1.2rc5
...
Upstream-commit: 9e1da3ec9ce8e608c17d999446882ae096b8394f
Component: engine
2013-11-17 22:36:26 -07:00
92d82345a3
Tiny typo cleanup
...
Upstream-commit: b76574f85512d3566bd056d516084e777788a82c
Component: engine
2013-11-17 21:10:06 -08:00
002c9db825
Vagrantfile modified to support VBoxGuestAdditions_4.3.2
...
Upstream-commit: 7e580aacec10d64c2fa0811e41a35159e47fcfa4
Component: engine
2013-11-17 01:20:21 +01:00
58c14de9fd
Fix images not being properly tagged
...
Upstream-commit: 0e64b987e8cbbd6944bd0594f8173f959867f4fc
Component: engine
2013-11-16 11:05:38 -05:00
a69dc14f58
make the docker commit help more copy&pasteable
...
Upstream-commit: bc74f65068b6b80b657e07f4ab2d7b115aacae75
Component: engine
2013-11-16 21:11:34 +10:00
dbb96cce3d
add example
...
Upstream-commit: 5c741ef11db8777bc7723d879624ae8281121c18
Component: engine
2013-11-16 20:53:45 +10:00
dbd9984b5b
add some common examples for docker images, and tell the user what -a filters out
...
Upstream-commit: 152459b7272daa30ab5207b512f5319fdc4ff491
Component: engine
2013-11-16 20:45:30 +10:00
b3d92f6b0f
add example for docker history
...
Upstream-commit: f04142c1f765b4d1afb8eb388f3ca9466c22abf7
Component: engine
2013-11-16 20:36:33 +10:00
83c673a90c
add an example of what to expect from docker diff, and what the 3 codes mean
...
Upstream-commit: af05ab399e17c97bdea4b3ee893c47f29c0e22a5
Component: engine
2013-11-16 20:26:47 +10:00
bc3e877db3
expunge the word 'Resource' in reference to a file/dir in a CONTAINER - that way users don't wonder how its different from a Path
...
Upstream-commit: 27159ce6bac4308b5fba311258fab8e852667787
Component: engine
2013-11-16 20:15:04 +10:00
b91918adb1
Merge pull request #2694 from shykes/separate-integration-tests
...
Separate integration tests
Upstream-commit: 51576069ad7470d308402536306c35f47cf89edb
Component: engine
2013-11-15 18:21:34 -08:00
b666bf948d
Fixes #2701 . Adds security section.
...
Upstream-commit: d33ffe44a9f09b0e0aedf162ee17076571479003
Component: engine
2013-11-15 18:12:35 -08:00
25c99ca04e
Re-enable api integration tests using only public remote API.
...
Upstream-commit: afe230718ead8cb1d1053a7132a034f0bd55b424
Component: engine
2013-11-16 02:12:14 +00:00
9d193b1c00
WIP
...
Upstream-commit: a518b847511f034d9bfd4166e17f8f0eac61d021
Component: engine
2013-11-15 17:16:30 -08:00
10d4ab171f
Fix tmp dir never cleanup
...
Upstream-commit: 926169059374fb7a7a7035dde4e78f3418778a80
Component: engine
2013-11-15 16:23:55 -08:00
