1
0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Commit Graph

4203 Commits

Author SHA1 Message Date
Michael Crosby
86d455035f Remove Differ and Changer interfaces
Add the methods to the Driver interface
to force the drivers to implement the methods
Upstream-commit: 4d1a537433ede2bbc75b0a4817e8121f9e03fd86
Component: engine
2013-11-11 12:10:53 -08:00
Solomon Hykes
675c173a12 Hack: set NONUKE environment variable to run the tests without cleanup, to investigate temp directories
Upstream-commit: ec6fe9f2007a0400a441b79c89bced5727589ba9
Component: engine
2013-11-11 18:56:21 +00:00
Solomon Hykes
dfe224141f Merge pull request #19 from alexlarsson/dm-plugin-Diff-fallback
Implement fallback operation for driver.Diff()
Upstream-commit: e87c3ea34243eb398364927d93ef27ee560e5601
Component: engine
2013-11-11 10:09:12 -08:00
Alexander Larsson
122fd6b9c2 Implement fallback operation for driver.Diff()
This moves the Diff() operation to a separate Differ interface and
implements a fallback that uses the Changes() results to encode
a diff tar.
Upstream-commit: e82f8c1661f3fa18e4dc6ca3aebe4dcc46e8961b
Component: engine
2013-11-11 17:46:07 +01:00
Solomon Hykes
7c76e102e9 Don't use drivers to store temporary image downloads
Upstream-commit: 948bb29d27dc7e367cd27003c059d83301b15c4f
Component: engine
2013-11-09 00:53:58 +00:00
Michael Crosby
82d35959fb Merge pull request #13 from crosbymichael/fix-volume-mount
Do not pass container information when creating a volume
Upstream-commit: 1f35531f396dba279b289a515416351568b96c0a
Component: engine
2013-11-08 16:35:00 -08:00
Michael Crosby
23a64a84bf Merge pull request #12 from crosbymichael/core-driver-test-failures
Core driver test failures
Upstream-commit: f30c660f6fe5e313f24f1646f9b5aaa3b487f5ab
Component: engine
2013-11-08 16:33:53 -08:00
Michael Crosby
911620a74d Do not pass container information when creating a volume
Upstream-commit: ddb27268c98941b9f8a131b7b5403eb4d44beebb
Component: engine
2013-11-08 16:11:57 -08:00
Michael Crosby
28000adccb Allow drivers to export their own diff
Upstream-commit: 1eb00e1d5b375cb79d492f1c5cd95d7317bc543c
Component: engine
2013-11-08 15:32:50 -08:00
Michael Crosby
f4f11a5ecb Allow driver to provide changes if it impl the Changer interface
Upstream-commit: 95147675870e9e84deb354f09f0f670a5cb2b1e1
Component: engine
2013-11-08 14:54:20 -08:00
Michael Crosby
4806ef83eb Add unit test for child changes diff in aufs
Upstream-commit: f512049c8f9e64848cd8b1be794619f01c5227f2
Component: engine
2013-11-08 12:25:17 -08:00
Michael Crosby
c94da34819 Make sure dirs are created before injecting file
Upstream-commit: 20f690f1762e369e9ad761e166f22ff57a17275a
Component: engine
2013-11-08 12:06:15 -08:00
Michael Crosby
4c9c43a611 Use tmp dir in driver home
Upstream-commit: 6669c86fdf1ae07b66a6e178e269d797f6397bca
Component: engine
2013-11-08 11:56:34 -08:00
Solomon Hykes
22263cd931 Merge pull request #6 from alexlarsson/fix-ApplyLayer-remove
archive.ApplyLayer() remove files recursively
Upstream-commit: 78ef0bd9985d899dda6fdfc8c35d9ab47f7f07d7
Component: engine
2013-11-08 11:46:55 -08:00
Solomon Hykes
f101f6ce8f Merge pull request #10 from crosbymichael/aufs-fixes
Aufs fixes and driver dir namespaceing 
Upstream-commit: c1563de7a1b65c26fc3155194458b4c6097548e9
Component: engine
2013-11-08 11:45:45 -08:00
Michael Crosby
d9e6045c49 Name sure drivers are confined into their own dir
Upstream-commit: 08a276986c363c5b2e7435fb59935485c53aae59
Component: engine
2013-11-08 11:36:58 -08:00
Michael Crosby
bc930472df Implement changes for aufs driver
Upstream-commit: ed1884461331d7c2d6561be30b09da9df6612d39
Component: engine
2013-11-08 11:10:33 -08:00
Michael Crosby
d042794393 Do not remove mountpoint on umount
Upstream-commit: 52f31657cc03c0097e6fd0d5e1d2c10fb31d2b95
Component: engine
2013-11-08 10:17:51 -08:00
Michael Crosby
5b0bff3941 Merge pull request #9 from crosbymichael/fix-aufs-tests
Fix aufs error at startup
Upstream-commit: 6d0b3f350e77b04f0270d0f719c2f40e8cd1bdda
Component: engine
2013-11-08 09:55:24 -08:00
Michael Crosby
491fee7d48 Fix aufs error at startup
Add String methods to other drivers
Upstream-commit: 51c93c0f3318efa95a02d25677a1a4837f1af9f6
Component: engine
2013-11-07 19:02:15 -08:00
Solomon Hykes
54325d7ac7 Set DOCKER_DRIVER to override the choice of driver (aufs, devicemapper or dummy)
Upstream-commit: 8c21d2acd33c2bbaba224e19fbef30a3ba8788df
Component: engine
2013-11-08 02:49:32 +00:00
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
Alexander Larsson
65b7bbeca7 archive.ApplyLayer() remove files recursively
Some aufs metadata are directories, and whiteouts can be for
directories, so use os.RemoveAll() for these.
Upstream-commit: 484804abffda2692492e295d4691f90564d05eb2
Component: engine
2013-11-07 22:46:44 +01: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