9331f255c0
Merge pull request #63 from tianon/flag-help-consistency
...
Update a few flag help strings for consistency and clarity
Upstream-commit: da824b4a5a1acd3409ff46f1795180f3303e99a8
Component: engine
2013-11-21 11:31:34 -08:00
cdba895115
Update a few flag help strings for consistency and clarity
...
Upstream-commit: 1ab6b8bf4970b050575b008dd658471e185f2a2c
Component: engine
2013-11-21 12:30:17 -07:00
a3c4139aad
Update ImageExport after merge fail
...
Upstream-commit: 253214f07da1a58931e6a256c351105eb2eee8bc
Component: engine
2013-11-21 10:26:21 -08:00
ebbbc781a4
Merge branch 'master' into 0.6.5-dm-plugin
...
Upstream-commit: a2c9d2da93e5106b82e8f3951947a90508a8f430
Component: engine
2013-11-21 10:21:30 -08:00
3152efa2ba
Merge pull request #2793 from crosbymichael/offline-ids
...
Allow images to be saved and loaded by id and repository
Upstream-commit: f20c738963cb54884037e54a62743398eebfc0c2
Component: engine
2013-11-21 02:44:00 -08:00
10c7f84432
Allow images to be saved and loaded by id and repository
...
Upstream-commit: fd7ab143bf1ecfbf20df90edd876f73dc28c264d
Component: engine
2013-11-20 17:28:19 -08:00
94ec1bcdfe
Merge pull request #2727 from SvenDowideit/docker-images-doc
...
add some common examples for docker images, and tell the user what -a filters out
Upstream-commit: 82cdd21a3492789a47fc4c3bb3f8a4d85b89d14c
Component: engine
2013-11-20 16:30:48 -08:00
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
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
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
2cabd3e833
Add more aufs tests and implement Status
...
Upstream-commit: 5306053e21cb2a22884d2d281c2cc855cf22fc69
Component: engine
2013-11-20 15:41:37 -08:00
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
f3c5785b7c
Fix image size calc on initial save
...
Upstream-commit: 8fdbf46afbcad9e4eab79b2804261b084267b6e4
Component: engine
2013-11-20 14:51:04 -08:00
02fde26286
wait on pull already in progress
...
Upstream-commit: 8a756f417ee4925bad6c8526fabda05ab8a6c041
Component: engine
2013-11-20 14:04:19 -08:00
afc3ae3564
Merge pull request #2723 from SvenDowideit/doc-build-image
...
Use the work Path for docker cp CONTAINER:PATH
Upstream-commit: 2bc35287a080cd9a9805e343595055dcbfb0db01
Component: engine
2013-11-20 11:10:13 -08:00
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
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
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
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
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
f6524ff456
Handle image metadata when drivers are switched
...
Upstream-commit: 1b28cdc7f977f265d0d8de53e8ec1d773ed54db1
Component: engine
2013-11-20 10:31:51 -08:00
eeb01414c6
Merge pull request #2747 from jpoimboe/test-fixes
...
Test fixes
Upstream-commit: 304a80fcd5ed6d3a73db6b7e73ab5e5ac5e9462d
Component: engine
2013-11-20 10:07:40 -08:00
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
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
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
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
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
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
92e4e393e6
Add typo in remove all. Ensure tmpDir is removed
...
Upstream-commit: 9de45904980dba224e8ab133f12cfc53835e2dd4
Component: engine
2013-11-20 03:52:33 +00:00
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
46ebe14722
Adding 1.7 documentation
...
Upstream-commit: 383f95bba1fef213473725fdf6193be0de5b73fd
Component: engine
2013-11-20 03:52:33 +00:00
b7d4ec1f01
Adding content type to images/(name)/get
...
Upstream-commit: 1211065c8d81fcc480ddea5d377982cab871d472
Component: engine
2013-11-20 03:52:33 +00:00
5b716c3df7
Fixing build
...
Upstream-commit: 844c13bce6429087e2763038136e6485da425741
Component: engine
2013-11-20 03:52:33 +00:00
623a7ac7d4
Setting offline package version to 1.0
...
Upstream-commit: 6014db4a7e8d76580edf995bc974a55dace0c8ba
Component: engine
2013-11-20 03:52:33 +00:00
9f3f248404
Adding spaces to fix docs build
...
Upstream-commit: bf504f2afab679922e92b8bb5fe28957f5f6bf02
Component: engine
2013-11-20 03:52:33 +00:00
bac700fc36
Adding version info, switching to defer for cleanup
...
Upstream-commit: 61a8020e51ac6de9bc777098a04e05a185c2cd32
Component: engine
2013-11-20 03:52:33 +00:00
390195822f
Offline Image Transfers #1155
...
Upstream-commit: 7eaa59f626fa9e9b3bf61d3d7eff0fb70b3d011a
Component: engine
2013-11-20 03:52:33 +00:00
56750f8076
Pip python deps to a specific version
...
Upstream-commit: 2cccbbdadd8ee7e28824c244e48acebfca96d78a
Component: engine
2013-11-19 19:25:54 -08:00
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
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
7818b4cfc3
Merge branch 'master' into vieux_merge_master
...
Upstream-commit: 880a0e9c36d95bceb9748755b7c139f8817d8a6c
Component: engine
2013-11-19 18:34:19 -08:00
00e4f0c411
don't import emport empty hostconfig
...
Upstream-commit: 0169cf15dd272f0403909a9be64fd1b575396ffc
Component: engine
2013-11-19 18:28:50 -08:00
48e095ca19
Merge branch 'master' into vieux_merge_master
...
Conflicts:
runtime.go
Upstream-commit: cd022376b8eda39ac23debc6b52fee46e08fcfdb
Component: engine
2013-11-19 17:32:08 -08:00
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
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
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
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
32bf4b495f
improve aufs cleanup and debugging
...
Upstream-commit: 43899a77bf638d4baa42291c1988bcb2a75e8ef5
Component: engine
2013-11-19 17:12:37 -08:00
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
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
