toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,634 Commits 3 Branches 295 Tags
e740d4f911781f2dc0127f1663de238d109efd2d
Commit Graph
22634 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Victor Vieux dcb211eeb0 improve tests on the engine 
Upstream-commit: 8e5ab5bfca2a7077f4e85096808c8f309cf692df
Component: engine
 2013-11-19 11:47:47 -08: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 791d32523f Fix #2342. Harmonize information about ADD. Cross-link build info. 
Upstream-commit: 4f9f83d6c6e71f826489f04e497f4a384c49a2c1
Component: engine
 2013-11-19 11:16:28 -08:00
Victor Vieux d8912e66aa speedup docker ps 
Upstream-commit: 145c2008ae3bbd8bca6e11bac93c6c0098a3ba42
Component: engine
 2013-11-19 11:02:10 -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
Michael Crosby 7600b7d415 Merge pull request #46 from alexlarsson/dm-plugin-dummy-use-cp 
Dummy driver: Use cp --reflink=auto to copy directories
Upstream-commit: 9af1b0708656b6870dbc89ad2ab860be8c6b65ad
Component: engine
 2013-11-19 10:16:56 -08:00
Vitor Monteiro e6a444ec3b Change to documentation for AWS AMI request 
Hi guys, it just might be me, but clicking the AMI from http://cloud-images.ubuntu.com/locator/ec2/ is broken to me. So I just did it via the normal Create Instance Wizard.

I just though some people might have the same issue.

Sorry if my markdown for links is screwed up, I went by the examples, since I'm used to the `[]()` traditional one.

Cheers.
Upstream-commit: aeb304b37c190e7fab60c0db946d1fd5d8e9e9f3
Component: engine
 2013-11-19 17:50:38 +00: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