toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,957 Commits 3 Branches 295 Tags
f35e7a7cdeb6278c41e640dd50ea1db2f08f6464
Commit Graph
4957 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
Solomon Hykes 91acb2bfd6 Devmapper: mock all calls to libdevmapper in the unit tests, and deny them by default 
Upstream-commit: e2390318bb4cc98886777bdad3fbb860942b8e65
Component: engine
 2013-11-20 23:39:02 +00: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
Solomon Hykes f3353c818b Devmapper: remove deprecated test helpers 
Upstream-commit: da514223d1e441e2bab82bf3b30e1a1e0e222ac6
Component: engine
 2013-11-20 23:25:27 +00:00
Solomon Hykes d1d0a44d0f devmapper: fix typo 
Upstream-commit: 023ff36704ef5ad8d6fc8d0c07f718fec2ec5ff0
Component: engine
 2013-11-20 23:12:19 +00:00
Michael Crosby f3c5785b7c Fix image size calc on initial save 
Upstream-commit: 8fdbf46afbcad9e4eab79b2804261b084267b6e4
Component: engine
 2013-11-20 14:51:04 -08:00
Guillaume J. Charmes 099a15779c Add devmapper struct doc 
Upstream-commit: d233894c25e2b1b7124d69bddece94c88fb44452
Component: engine
 2013-11-20 14:09:46 -08:00
Victor Vieux 02fde26286 wait on pull already in progress 
Upstream-commit: 8a756f417ee4925bad6c8526fabda05ab8a6c041
Component: engine
 2013-11-20 14:04:19 -08:00
Guillaume J. Charmes 3bd981cb53 Remove os from devmapper 
Upstream-commit: a39bd656622c7dbea534fe34710ed6cb21dd5a90
Component: engine
 2013-11-20 13:05:17 -08:00
Guillaume J. Charmes 8380e89daf Remove all syscall calls from devicemapper 
Upstream-commit: 5690139785fc2bfaa2f233ed41d5f927a8b28dbf
Component: engine
 2013-11-20 12:49:01 -08:00
Solomon Hykes 495a0f953c Mock calls to system functions to facilitate unit testing 
Upstream-commit: 92f94f06ae2fb4cddace5b817d6a6e326f3c9b33
Component: engine
 2013-11-20 20:05:10 +00:00
Michael Crosby 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
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
Johan Euphrosine c226d5fb61 utils: remove dotcloud/tar dep 
Upstream-commit: b3bee7e0c43dd281c081cd59d7403148d3f8af88
Component: engine
 2013-11-20 18:45:12 +00: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
Vincent Batts 74719b69d1 do not setup bridge ip if bridgeNetwork is nil. This is the case when 
-b='none' bridge is provided.

issue #2768
https://bugzilla.redhat.com/show_bug.cgi?id=1032094
Upstream-commit: 60cb5f1a34147250a46b623964f88823a40a0280
Component: engine
 2013-11-20 09:36:38 -05: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