docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Code Activity
4,493 Commits 12 Branches 297 Tags
7818b4cfc365ceb6dd55f7dec82cba895bb8f450
Commit Graph

4163 Commits

Author SHA1 Message Date
Victor Vieux
7818b4cfc3 Merge branch 'master' into vieux_merge_master 
Upstream-commit: 880a0e9c36d95bceb9748755b7c139f8817d8a6c
Component: engine
 2013-11-19 18:34:19 -08:00
Victor Vieux
00e4f0c411 don't import emport empty hostconfig 
Upstream-commit: 0169cf15dd272f0403909a9be64fd1b575396ffc
Component: engine
 2013-11-19 18:28:50 -08:00
Victor Vieux
48e095ca19 Merge branch 'master' into vieux_merge_master 
Conflicts:
	runtime.go
Upstream-commit: cd022376b8eda39ac23debc6b52fee46e08fcfdb
Component: engine
 2013-11-19 17:32:08 -08:00
Michael Crosby
ad8fb52fd4 Merge pull request #2750 from jpoimboe/simplify-register-reconnect 
Simplify the runtime Register reconnect logic
Upstream-commit: 234f5ac39f22b02cce62d789283a4ed80b728fe2
Component: engine
 2013-11-19 17:30:59 -08:00
Michael Crosby
127023e5bb Merge pull request #53 from shykes/improve_cleanup 
Improve aufs cleanup and debugging
Upstream-commit: d4ef551d654b6b3b91aed68152789fc2869d83fd
Component: engine
 2013-11-19 17:16:36 -08:00
Victor Vieux
f762c896a3 Merge pull request #39 from crosbymichael/add-driver-flag 
Add flag to set default graph driver
Upstream-commit: 76f54f3a28437c445c3ea216d7efd6a9a0ff0d25
Component: engine
 2013-11-19 17:16:25 -08:00
Victor Vieux
32bf4b495f improve aufs cleanup and debugging 
Upstream-commit: 43899a77bf638d4baa42291c1988bcb2a75e8ef5
Component: engine
 2013-11-19 17:12:37 -08:00
Victor Vieux
9670fcc04b Merge pull request #2748 from jpoimboe/fix-restart-race-condition 
fix container restart race condition
Upstream-commit: d57591803847ea1492ee74cb1199407059ab6c63
Component: engine
 2013-11-19 16:26:13 -08:00
Guillaume J. Charmes
fe58dd376c Merge pull request #50 from crosbymichael/limit-dm 
Prohibit more than 42 layers in the core
Upstream-commit: f6629bbbd53f8a296b3f29cd4958406b79e8b383
Component: engine
 2013-11-19 15:42:00 -08:00
Guillaume J. Charmes
cf0c94cbee Merge pull request #48 from crosbymichael/reset-mtime 
Ensure same atime, mtime after applying whiteouts
Upstream-commit: 91330243b53c5340c80d132379d0e97f2fb0c771
Component: engine
 2013-11-19 15:40:12 -08:00
Guillaume J. Charmes
cdf4bbcde9 Merge pull request #41 from alexlarsson/dm-plugin-device-tool 
Update docker-device-tool
Upstream-commit: 3e0a5ac48bfc65950b31bc7311d2662816cbe475
Component: engine
 2013-11-19 15:38:47 -08:00
Guillaume J. Charmes
e7eec12a53 Fix unit-tests 
Upstream-commit: 12e993549df025d072add1a0bcb9bfcc7fe5bdb5
Component: engine
 2013-11-19 15:24:14 -08:00
Guillaume J. Charmes
b6950e3878 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
Upstream-commit: 28d4cbbc59e419f00c1ad75991b106241933ca5d
Component: engine
 2013-11-19 14:58:12 -08:00
Victor Vieux
58c3812d34 Merge pull request #43 from alexlarsson/dm-plugin-use-root-subdir 
devmapper: Use a "root" subdirectory in the devmapper volume
Upstream-commit: 5a4113140e4a9f00a2f3d97205fe7e146f955b4b
Component: engine
 2013-11-19 13:51:04 -08:00
Victor Vieux
0bc401d12d Merge pull request #44 from crosbymichael/container-migration 
Container and Image migration for aufs
Upstream-commit: 85b5062502deed324f3e44ae5c46de1aefe61bbf
Component: engine
 2013-11-19 13:47:23 -08:00
Josh Poimboeuf
220d989071 simplify the runtime Register reconnect logic 
Refactor the Register code a little bit to make it easier to comprehend.
Upstream-commit: 3cbec951772b9849c0ba679a5988b54384d05ce1
Component: engine
 2013-11-19 14:09:30 -06:00
Michael Crosby
267e312526 Merge pull request #2759 from dotcloud/lintify-1 
Lintify code with confidence=1
Upstream-commit: 9d867a389b02300e77ced26a702f9a8d8050c16e
Component: engine
 2013-11-19 11:26:15 -08:00
Andy Rothfusz
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
Andy Rothfusz
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
Andy Rothfusz
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
Michael Crosby
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
Michael Crosby
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
Ryan Seto
8dfcb6d8f5 Fix quote mistake. 
Upstream-commit: 1da8c50deddde692c1f87aec86c20cd3c2c3fd11
Component: engine
 2013-11-19 12:14:39 -05:00
Tianon Gravi
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
Daniel Mizyrycki
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
Sylvain Bellemare
3ec0757555 fixed typos, and made small improvements to the wording 
Upstream-commit: 3656db66d2f13d74e07574d229b32023bb11dc1f
Component: engine
 2013-11-19 14:44:50 +01:00
Alexander Larsson
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
Alexander Larsson
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
Michael Crosby
a07b5796a9 Rename AufsDriver to Driver to be consistent 
Upstream-commit: 51a972f38d0b6e2e7a4b27509b58fc7a6e92679f
Component: engine
 2013-11-19 03:27:59 -08:00
Michael Crosby
2a2c0a4cdc Check env var for setting driver in tests 
Upstream-commit: aea6001baf0cd0fb20a607e37e4379bf644b28fd
Component: engine
 2013-11-19 03:13:22 -08:00
Michael Crosby
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
Alexander Larsson
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
Alexander Larsson
339d427535 Move docker-device-tool to contrib 
Upstream-commit: 9415c2b1f08ecd168ab5a620a80a5bed34df8adb
Component: engine
 2013-11-19 10:03:04 +01:00
Alexander Larsson
90396dc0fc devicemapper tool: Add support for pool resizing 
Upstream-commit: a0224e61b48e1dd1378cb955596fba1937e99068
Component: engine
 2013-11-19 09:59:13 +01:00
Michael Crosby
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
Alexander Larsson
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
Michael Crosby
04ef2191af Ensure same atime, mtime after applying whiteouts 
Upstream-commit: 3edb4af663079ad79672bc98fcd20790f8fb2589
Component: engine
 2013-11-19 00:35:03 -08:00
Alexander Larsson
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
Michael Crosby
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
Michael Crosby
2d65b723cd Add container migration to aufs driver 
Upstream-commit: 29f07f854497571db570be79c8df878624f5b41c
Component: engine
 2013-11-18 18:39:21 -08:00
Ryan Seto
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
Andy Rothfusz
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
Guillaume J. Charmes
6e0c243c2e Lintify code with confidence=1 
Upstream-commit: 5e941f1ca035bb1ec014c18d277aecaa41deba85
Component: engine
 2013-11-18 16:24:11 -08:00
Michael Crosby
3688213d04 Migrate images with parent relationship 
Upstream-commit: f88b760809677109a723f25399f738d756f14c13
Component: engine
 2013-11-18 16:17:43 -08:00
Andy Rothfusz
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
Andy Rothfusz
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
Ryan Seto
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
Michael Crosby
80e02fbc62 Use tryRelocate to fall back to symlink if rename fails 
Upstream-commit: 94e854823f3549eeddaafa24835093966d9aaeeb
Component: engine
 2013-11-18 13:16:28 -08:00
Andy Rothfusz
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
Victor Vieux
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