toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,181 Commits 3 Branches 295 Tags
f7fbe4b3770e557c77fea3769a3ad4488057f6cb
Commit Graph
4181 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Solomon Hykes f7fbe4b377 Don't hardcode dependency on aufs in the tests 
Upstream-commit: 1e5c61041f54de1146d8edb44e85b9419f4f6342
Component: engine
 2013-11-08 02:49:08 +00:00
Solomon Hykes 07ffba21a6 Don't rely on drivers for diff and export 
Upstream-commit: 99210c9c6efbe10df922faa66fa3232ab898ef7b
Component: engine
 2013-11-08 02:48:52 +00:00
Solomon Hykes e1bd820a04 Fix a bug which caused Graph.Register to fail when Graph.Mktemp() returns an existing directory. 
Upstream-commit: 1764cf1990791dd15636f6e906960ad43d5689ad
Component: engine
 2013-11-08 02:13:11 +00:00
Solomon Hykes 8fcfb27c96 Merge pull request #8 from crosbymichael/improve-aufs-detection 
aufs: Improve aufs detection by looking at proc fs
Upstream-commit: 9afe475edb190af53dc57e9db4522d73e7562ad5
Component: engine
 2013-11-07 17:59:24 -08:00
Michael Crosby 2835e8d724 Improve aufs detection by looking at proc fs 
Upstream-commit: 043a57617139dd4afefc2099e3bd85c8acaf0d68
Component: engine
 2013-11-07 17:57:14 -08:00
Solomon Hykes a38c2eb35b New 'dummy' driver uses plain directories and regular copy 
Upstream-commit: 81674fbbdf657de2c1d13b7c84a41c9edd3c8aa1
Component: engine
 2013-11-08 01:52:56 +00:00
Solomon Hykes f94c689b1e Merge pull request #7 from crosbymichael/updated-interfaces 
Updated aufs driver for new interface
Upstream-commit: 0a9df6bc1a8260fed2e038399106c8055689a9c8
Component: engine
 2013-11-07 17:43:31 -08:00
Michael Crosby fb05315d03 Fix test for aufs graph and add aufs driver import 
Upstream-commit: 12ffead71a06e5cf0ea4b1e6ce19231dceb265dc
Component: engine
 2013-11-07 17:01:57 -08:00
Michael Crosby 681ed9aee0 Update aufs driver to new interface spec 
Upstream-commit: b8b509e1c8c9b9def04850eaad8369b9ec6d9e0a
Component: engine
 2013-11-07 16:46:47 -08:00
Solomon Hykes 7362e77db4 Move Change to the archive package 
Upstream-commit: 01990b65a3cf3da5e04aa6612a17ead2a6cac2c9
Component: engine
 2013-11-07 16:46:47 -08:00
Solomon Hykes 914824bce7 Move Change to the archive package, and fix a leftover merge in 
Container.Inject()
Upstream-commit: 9ae4bcaaf8aa01da340341e47f99f83a59ce91dc
Component: engine
 2013-11-08 00:45:07 +00:00
Solomon Hykes 783f801512 gofmt 
Upstream-commit: f1127b9308fbb4d4e21c3c5567ace9fdda82559d
Component: engine
 2013-11-07 23:58:03 +00:00
Solomon Hykes c471d2b756 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	runtime.go
Upstream-commit: 165d1bdbc0c4236df9afe85d9cd8b1e65d625865
Component: engine
 2013-11-07 23:26:52 +00:00
Solomon Hykes 5d51812837 devmapper: port to the new driver API and reactivate driver 
Upstream-commit: 4a8a7d4edd53251c8de7ea087b092869e15621d5
Component: engine
 2013-11-07 22:41:55 +00:00
Solomon Hykes 7e3e167f73 Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface 
Upstream-commit: f2bab1557c3fef4a95b5b982fe7127fcb29c4f8f
Component: engine
 2013-11-07 22:38:50 +00:00
Michael Crosby e285c55a83 Merge pull request #2589 from dotcloud/gofmt 
Go fmt
Upstream-commit: cd4f7321c932efe2c95e221e2e685856c79ef30d
Component: engine
 2013-11-07 12:32:58 -08:00
Solomon Hykes 4629ddf3be Fix a crash in graphdriver init 
Upstream-commit: a63ff8da46e11c857cd3d743d72d211c96b637e4
Component: engine
 2013-11-07 20:31:50 +00:00
Solomon Hykes a48448b288 Internal cleanup: use the mounted container filesystem instead of manipulating the aufs layers directly 
Upstream-commit: 77ae9789d3e1cfb895de9eaf343866f984c92668
Component: engine
 2013-11-07 20:30:56 +00:00
Michael Crosby 8d5420a376 Merge pull request #2591 from dotcloud/fix_Assign_id_as_name_when_all_else_fails 
Fix Assign id as name when all else fails
Upstream-commit: 132db329d479c1d8712117534798810df8c1b8ec
Component: engine
 2013-11-07 12:29:02 -08:00
Guillaume J. Charmes 6d24142423 go fmt 
Upstream-commit: 6998c3c387518ba8e06ceff00b10be583c95d6cd
Component: engine
 2013-11-07 12:27:33 -08:00
Victor Vieux b5fe937fc9 fix Assign id as name when all else fails 
Upstream-commit: 26f846bf779c97a69e85db356dff8c1fff76161c
Component: engine
 2013-11-07 12:23:29 -08:00
Michael Crosby 61da922aa3 Merge pull request #2561 from dotcloud/add_iptabled_errors 
Make iptable return an error in case of output
Upstream-commit: b5c984f9b4899d577430134135379b0088d88b47
Component: engine
 2013-11-07 09:15:09 -08:00
Andy Rothfusz 80db89881c Fix bold 
Upstream-commit: 9990db2f5a762fdbc198cbfc5e96370d859739bb
Component: engine
 2013-11-06 18:07:55 -08:00
andy diller 9970f516fc updated create, showing how to set expose port and bind to public port for ssh 
Upstream-commit: 2d1155407a6e24b595d2627af6fa9f9f702483d2
Component: engine
 2013-11-06 18:07:55 -08:00
Andy Rothfusz d4449d4111 Merge pull request #2557 from jamtur01/new_redis 
Updated Redis service example to use links. Removed "Linking Redis" example as redundant.
Upstream-commit: 37dcff0c13c6e4ee71b22b7e4902c2e4b4b88132
Component: engine
 2013-11-06 17:54:34 -08:00
Andy Rothfusz 493375c769 Merge pull request #2567 from mck-/patch-1 
Add -p when running the container (node example)
Upstream-commit: 38f1838e821822037f334dc4aee1da9a3c76c53c
Component: engine
 2013-11-06 17:34:11 -08:00
Andy Rothfusz a16746b24c Merge pull request #1794 from justone/add-images-tree 
add -tree option to images
Upstream-commit: 807a305f36c54d54a20109992f4f301b62ae0081
Component: engine
 2013-11-06 16:12:36 -08:00
Victor Vieux 0e9c1fdcf5 Merge pull request #2577 from dotcloud/bump_v0.6.6 
Bump v0.6.6
Upstream-commit: cb1c90975bbb2b3962b2ba611c58adac69bcf0c1
Component: engine
 2013-11-06 13:41:52 -08:00
Nate Jones 85bf6b92cb updating cli help doc for images 
Upstream-commit: 363738b8f21d02c2e4fac84bd2776c2d4a5e6755
Component: engine
 2013-11-06 12:03:45 -08:00
Victor Vieux 7bfea51316 Bump version to v0.6.6 
Upstream-commit: 360a694c52a48e0305317a18c59dc5ddc44859ad
Component: engine
 2013-11-06 11:43:02 -08:00
Nate Jones 143de969f1 fix /images/json doc for 1.7 
Upstream-commit: 16eba6bbb514fb4082e6779e175a29698a6734ce
Component: engine
 2013-11-06 11:30:04 -08:00
Victor Vieux 34d9e796b2 Merge pull request #2568 from mrallen1/fix/1965 
See if a path exists before injecting Reader there
Upstream-commit: 0dd6c6645bd7148537c6e4b3b32abe1c852b992c
Component: engine
 2013-11-06 10:57:06 -08:00
Guillaume J. Charmes d677b4b873 Merge pull request #2334 from SvenDowideit/2149-small-cli-usability-change 
change ID to CONTAINER ID/IMAGE ID
Upstream-commit: 45aba3dc959d867147fedc8e8ac578d2acfb4d79
Component: engine
 2013-11-06 09:45:23 -08:00
Guillaume J. Charmes 2e67093fd5 Merge pull request #1577 from mrallen1/fix/1502 
Prevent DNS server conflicts in CreateBridgeIface
Upstream-commit: c22ff0296e743443b3d79b0bd5f8b9bd97a77e13
Component: engine
 2013-11-06 07:52:50 -08:00
Guillaume J. Charmes 563816191a Add debug to iptables 
Upstream-commit: 00f1398f7a8543e2448723635d93ea6ddf1eaadb
Component: engine
 2013-11-06 07:37:43 -08:00
Mark Allen 73c7a730fc See if a path exists before injecting Reader there 
Closes #1965
Upstream-commit: 74f853a2aeaf86ff675ecab5387bbd710a0138b7
Component: engine
 2013-11-05 23:44:52 -06:00
Marc Kuo c0461f4ee4 Add -p when running the container 
Without it, docker was not mapping/exposing the private port

Docker version 0.6.5, build 3ff8459
Upstream-commit: 3108f0526ef25596c7f6f545b07c95d90e966a7d
Component: engine
 2013-11-05 20:48:16 -08:00
Nate Jones 02bfc139c1 fixup for rebase 
Upstream-commit: 22ef38ee79c2f353578f3642918a44126b4cb48c
Component: engine
 2013-11-06 04:23:07 +00:00
Nate Jones 2e403649d0 update "images" documentation 
Upstream-commit: 6d5b73c2a6d668b11d6b5c643a45170265bf73c0
Component: engine
 2013-11-06 04:23:07 +00:00
Nate Jones e9a1f4f7ff add image size to -tree 
Upstream-commit: b7d1d35c278c57ad4732dc23e529cf771158ee96
Component: engine
 2013-11-06 04:23:07 +00:00
Nate Jones 377a3eb7ca adding test for "images -tree" 
Upstream-commit: f1aeac361aadc90a35e1b839933afbf9ad27a1a1
Component: engine
 2013-11-06 04:23:02 +00:00
Nate Jones 7820a4a479 adding test for "images -viz" 
Upstream-commit: d9fe0647cb464ccd6f79ac33fb1d1ac56441f6b0
Component: engine
 2013-11-06 04:04:24 +00:00
Nate Jones f53ad091dd make existing tests pass 
Upstream-commit: 059bb7a262a7620d8c7c5fdd064af352ae242f65
Component: engine
 2013-11-06 03:58:16 +00:00
Nate Jones 2dbd3407de implement "images -tree" 
Upstream-commit: ec9a9a08b8b76079207ced5b55a7caade27fb3d3
Component: engine
 2013-11-06 03:58:16 +00:00
Nate Jones 736f474973 bring back /images/viz, but 404 for latest 
Upstream-commit: 8f64759881b3d48e42927ed9bdf1c9162d3c8bb3
Component: engine
 2013-11-06 03:58:15 +00:00
Nate Jones cbbaa36a2b move "images -viz" to client 
Upstream-commit: 2a5998baf172f94a8d6866e46207a0d7d75e70e5
Component: engine
 2013-11-06 03:58:15 +00:00
Nate Jones 08d9fe490e fix "images -a" 
Upstream-commit: dcf0279a50e7a2eca97b205725df474a516b8f79
Component: engine
 2013-11-06 03:58:15 +00:00
Nate Jones b5c0cbf917 bump api version and ensure backward compat 
Upstream-commit: d7928b9a673e9b2aff36fa6961481312455c91f4
Component: engine
 2013-11-06 03:58:15 +00:00
Nate Jones 59c6d98498 rework images JSON 
Upstream-commit: 15867ff4308c5c1330a400be56410d404336100f
Component: engine
 2013-11-06 03:58:15 +00:00
Mark Allen a507d209c4 Prevent DNS server conflicts in CreateBridgeIface 
Retrieve /etc/resolv.conf data (if available)

Add checkNameserverOverlaps and call it to
make sure there are no conflicts

Add utils.GetNameserversAsCIDR and tests

Read /etc/resolv.conf and pull out nameservers,
formatting them as a CIDR block ("1.2.3.4/32")
Upstream-commit: 3560c922b193e0f6b06c715a7b920f90a5990859
Component: engine
 2013-11-05 21:24:37 -06:00