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,533 Commits 12 Branches 297 Tags
ead56a419b1818d4b3242db032cdcb712200e261
Commit Graph

4533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
ead56a419b Merge pull request #57 from shykes/wait_on_pull_already 
Wait on pull already in progress
Upstream-commit: a9230af52e819add5055aa0336e225f77dc62d2a
Component: engine
 2013-11-20 15:58:51 -08:00
Victor Vieux
ad45902f80 Merge pull request #59 from crosbymichael/fix-image-save-size 
Fix image save size
Upstream-commit: 2f0d18ac4a344826167d0e0217ba9963a7841b03
Component: engine
 2013-11-20 15:58:31 -08:00
Michael Crosby
335bf51077 Merge pull request #58 from crosbymichael/update-aufs-tests 
Add more aufs tests and implement Status
Upstream-commit: 646942246536952b9932cf48b5ec984ad8ac2d8a
Component: engine
 2013-11-20 15:41:59 -08:00
Michael Crosby
2cabd3e833 Add more aufs tests and implement Status 
Upstream-commit: 5306053e21cb2a22884d2d281c2cc855cf22fc69
Component: engine
 2013-11-20 15:41:37 -08:00
Michael Crosby
6fbdd28642 Ensure that only the layers are compressed and not mnt points 
Upstream-commit: 4e0c76b321cf42d36cdbedcf84103f4fcc123ecd
Component: engine
 2013-11-20 15:37:26 -08:00
Michael Crosby
f3c5785b7c Fix image size calc on initial save 
Upstream-commit: 8fdbf46afbcad9e4eab79b2804261b084267b6e4
Component: engine
 2013-11-20 14:51:04 -08:00
Victor Vieux
02fde26286 wait on pull already in progress 
Upstream-commit: 8a756f417ee4925bad6c8526fabda05ab8a6c041
Component: engine
 2013-11-20 14:04:19 -08:00
Michael Crosby
cdb93a78ac Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	server.go
Upstream-commit: 2382a0f920f7473b2b2762d886470a417a5dbac7
Component: engine
 2013-11-20 11:07:42 -08:00
Guillaume J. Charmes
03bb8581c6 Merge pull request #51 from crosbymichael/driver-specific-image 
Handle image metadata when drivers are switched
Upstream-commit: 579a5c843bb813bd2080939172de88abe544851a
Component: engine
 2013-11-20 10:45:51 -08:00
Guillaume J. Charmes
21fd83f708 Merge pull request #55 from alexlarsson/dm-plugins-cleanup-graph-test 
graph_test: Clean up drivers allocated in tempGraph()
Upstream-commit: 6ebb236aa11c9edb6ffc7e681d2db128190ce634
Component: engine
 2013-11-20 10:41:18 -08:00
Guillaume J. Charmes
c17e4279fa Merge pull request #2773 from dotcloud/speed_up_docker_ps 
speedup docker ps
Upstream-commit: b4f7078a021489395bae4e43a33d457719d30ccc
Component: engine
 2013-11-20 10:40:03 -08:00
Guillaume J. Charmes
88d0c27664 Merge pull request #2760 from dotcloud/improve_engine_test 
improve tests on the engine
Upstream-commit: 9e68913397f6fa6aa495480d72b56b5e071ef40b
Component: engine
 2013-11-20 10:38:46 -08:00
Michael Crosby
f6524ff456 Handle image metadata when drivers are switched 
Upstream-commit: 1b28cdc7f977f265d0d8de53e8ec1d773ed54db1
Component: engine
 2013-11-20 10:31:51 -08:00
Victor Vieux
eeb01414c6 Merge pull request #2747 from jpoimboe/test-fixes 
Test fixes
Upstream-commit: 304a80fcd5ed6d3a73db6b7e73ab5e5ac5e9462d
Component: engine
 2013-11-20 10:07:40 -08:00
Guillaume J. Charmes
b2a9ff5472 Merge pull request #2788 from jpoimboe/resize-after-start 
resize pty after starting
Upstream-commit: 04f1d4dcdb5ec0507595943771b5282dbd26798e
Component: engine
 2013-11-20 10:01:59 -08:00
Josh Poimboeuf
5763c9619e resize pty after starting 
Since ptyMaster is created during container start (startPty), it should
resized after starting, not before.
Upstream-commit: 171d681724443cf69f669dcaf4887f5d99894b25
Component: engine
 2013-11-20 11:40:30 -06:00
Alexander Larsson
2037c16136 tags test: cleanup driver 
If not we leak a devicemapper pool
Upstream-commit: cfdc284abee59057d6c6f7bc751d5648d8f8688e
Component: engine
 2013-11-20 14:52:06 +01:00
Alexander Larsson
7032acc12c graph_test: Clean up drivers allocated in tempGraph() 
If we don't do this we leak devicemapper pools with the dm backend.
Upstream-commit: 7192be47c5a787094c6450b904622159c85b70de
Component: engine
 2013-11-20 14:42:32 +01:00
Michael Crosby
b5aa530e7a Merge pull request #2779 from crosbymichael/pin-python-deps 
Pip python deps to a specific version
Upstream-commit: cd4c1ac35606bf2a245a76b6b3fd3ff1f2d67d03
Component: engine
 2013-11-19 21:29:09 -08:00
Michael Crosby
c381c4ac31 Merge pull request #1974 from dotcloud/1155-offline-image-transfer 
Implement offline image transfers
Upstream-commit: b8af68a92b9914c5fca0753660f52420d40fa01e
Component: engine
 2013-11-19 20:00:58 -08:00
Michael Crosby
92e4e393e6 Add typo in remove all. Ensure tmpDir is removed 
Upstream-commit: 9de45904980dba224e8ab133f12cfc53835e2dd4
Component: engine
 2013-11-20 03:52:33 +00:00
Michael Crosby
3f60be4255 Fix error checks for offline transfer and remove unneeded debug output 
Upstream-commit: 0ef6fed5c7b7b1ab4084ecc99880ffc6a7c8eaca
Component: engine
 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
46ebe14722 Adding 1.7 documentation 
Upstream-commit: 383f95bba1fef213473725fdf6193be0de5b73fd
Component: engine
 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
b7d4ec1f01 Adding content type to images/(name)/get 
Upstream-commit: 1211065c8d81fcc480ddea5d377982cab871d472
Component: engine
 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
5b716c3df7 Fixing build 
Upstream-commit: 844c13bce6429087e2763038136e6485da425741
Component: engine
 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
623a7ac7d4 Setting offline package version to 1.0 
Upstream-commit: 6014db4a7e8d76580edf995bc974a55dace0c8ba
Component: engine
 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
9f3f248404 Adding spaces to fix docs build 
Upstream-commit: bf504f2afab679922e92b8bb5fe28957f5f6bf02
Component: engine
 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
bac700fc36 Adding version info, switching to defer for cleanup 
Upstream-commit: 61a8020e51ac6de9bc777098a04e05a185c2cd32
Component: engine
 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
390195822f Offline Image Transfers #1155 
Upstream-commit: 7eaa59f626fa9e9b3bf61d3d7eff0fb70b3d011a
Component: engine
 2013-11-20 03:52:33 +00:00
Michael Crosby
56750f8076 Pip python deps to a specific version 
Upstream-commit: 2cccbbdadd8ee7e28824c244e48acebfca96d78a
Component: engine
 2013-11-19 19:25:54 -08:00
Michael Crosby
f1ffabae30 Merge pull request #54 from shykes/vieux_merge_master 
Merge from master
Upstream-commit: 24586d7af522e8d13ea0363437b4062aeb77cf70
Component: engine
 2013-11-19 18:38:15 -08:00
Victor Vieux
907033fb80 Merge pull request #2777 from dotcloud/fix_port_stop_start 
don't import emport empty hostconfig
Upstream-commit: b700ee006aee0811d55c79632d038d92a9aebfbc
Component: engine
 2013-11-19 18:36:22 -08:00
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
1077f74ce5 Merge pull request #52 from crosbymichael/rename-aufs-driver 
Rename AufsDriver to Driver to be consistent
Upstream-commit: 43b709ab364ce5a40e18c705ade46bb39f747d6a
Component: engine
 2013-11-19 17:13:44 -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
Michael Crosby
454bfc3be5 Merge pull request #49 from shykes/creack-merge-master 
Merge master into 0.6.5-dm-plugin
Upstream-commit: 0d603df6dcee18aac797111eef633c61849c41dd
Component: engine
 2013-11-19 15:29:09 -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
Tianon Gravi
4af17f4fed rename file to remove testing flags from docker binary 
Upstream-commit: 66beafa9f3ee72c26773158c7102cb727613ac65
Component: engine
 2013-11-19 12:41:29 -08:00