docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Code Activity
3,808 Commits 12 Branches 297 Tags
e702af3a568ac8385111c083db5deb06ffdd6eac
Commit Graph

136 Commits

Author SHA1 Message Date
Guillaume J. Charmes
f83e69dc32 Merge branch 'master' into dm 
Conflicts:
	Dockerfile
	buildfile.go
	container.go
	hack/make/test
	runtime_test.go
	utils/utils.go
Upstream-commit: e9ee860c91b6e9cdcafc03cff9941affb6341a0d
Component: engine
 2013-10-18 12:38:29 -07:00
Solomon Hykes
b73358fb51 devmapper: the tests are fast enough that we no longer need a workaround to avoid timeouts 
Upstream-commit: cad913c57bbd1d9f9b3b2284ee9e2c262734047b
Component: engine
 2013-10-18 06:48:20 +00:00
Solomon Hykes
06ac81c4b1 Hack: don't run integration tests in /var/lib/docker/unit-tests; add missing cleanups in a few tests 
Upstream-commit: 240d5b3fa1b66f099b71c20ff8dc4ed1ecffc1d3
Component: engine
 2013-10-18 02:13:36 +00:00
Solomon Hykes
d24b97a314 devmapper: Rename DeviceSetDM to DeviceSet 
Upstream-commit: 4bd6021806985b48b872aa9dbe2d0183675eac1d
Component: engine
 2013-10-18 00:07:56 +00:00
Solomon Hykes
8e5b6c7d93 Remove race condition caused by double-destroy in 2 tests 
Upstream-commit: 330062ef723f66ed8a640627f983e586f46df03a
Component: engine
 2013-10-17 23:59:59 +00:00
Guillaume J. Charmes
5c8226fc06 Add error checking and error messages 
Upstream-commit: 31b883b07641bfab721a05f0a68629c79b74a058
Component: engine
 2013-10-17 15:04:14 -07:00
Solomon Hykes
d7aa3ef25d Add debug messages while testing devicemapper 
Upstream-commit: 11d695a2973d67906145e7f0972b6e693bdaa3f9
Component: engine
 2013-10-16 20:45:59 +00:00
Guillaume J. Charmes
e0dfea89d2 Change default values for devicemapper as variable instead of env 
Upstream-commit: 3a246ac3d1368931998a082043c9b719dd3c10cd
Component: engine
 2013-10-16 20:42:50 +00:00
Solomon Hykes
9c9b801114 Hack: don't run integration tests in /var/lib/docker/unit-tests; add missing cleanups in a few tests 
Upstream-commit: 1da335f784882292fb55b25bf255ec5f45072ea4
Component: engine
 2013-10-16 20:10:20 +00:00
Victor Vieux
c27a5b0233 add cleanupin tests to remove leftover containers 
Upstream-commit: f854529ae8c9e0139e9ca0466c597b133e3bf41e
Component: engine
 2013-10-16 18:06:37 +00:00
Michael Crosby
bedabb5a87 Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix 
Abort build if mergeConfig returns an error and fix duplicate error message
Upstream-commit: 4196c704f052687e8b9010f0e407f66417c55d04
Component: engine
 2013-10-15 17:40:48 -07:00
Solomon Hykes
05176434d1 WIP: debugging dm-base-hash + dm-refactor-init 
Upstream-commit: cd61fb2e6f9d2a7bbd3c4db2ab9091674746126d
Component: engine
 2013-10-15 23:56:04 +00:00
Solomon Hykes
58a19a7d93 Merge branch 'dm-refactor-init' into dm 
Conflicts:
	runtime_test.go
Upstream-commit: fdba1aeed8c80b3c2f8cd14c3b393581e7ef99a8
Component: engine
 2013-10-15 23:27:28 +00:00
Solomon Hykes
9549f4f9e3 Merge branch 'dm-missing-mapper' into dm 
Upstream-commit: 54b0cd7cd1cbea8ca35716bd1b4a20a1900029f4
Component: engine
 2013-10-15 22:51:20 +00:00
Solomon Hykes
80b9a304af Merge branch 'dm-fix-test-2' into dm 
Upstream-commit: 66db2ac9d8176a847936afbad901e97249c27f37
Component: engine
 2013-10-15 22:42:49 +00:00
Michael Crosby
246243d186 Add filesystemtype for containers 
If no type is specified then assume aufs.
Upstream-commit: 80bd64245f14d4d8a6fc8349cff8b441d770da42
Component: engine
 2013-10-15 11:49:13 -07:00
Solomon Hykes
5b6d6020fa Initialize devicemapper in NewRuntimeFromDIrectory 
Upstream-commit: 7093411a8dd36612ddc636c14395e33ecff47f7f
Component: engine
 2013-10-15 03:53:48 +00:00
Guillaume J. Charmes
3b33148b08 Make sure the base device is well created before running the tests 
Upstream-commit: 5778ed7db2fee3b7005a53a06d010272504924e9
Component: engine
 2013-10-14 18:36:18 -07:00
Michael Crosby
b5fc16147b Ignore cleanup with /dev/mapper does not exist 
Upstream-commit: 5dd12ba20a962c0f67e5eefb7b0e00e5caccb1e1
Component: engine
 2013-10-14 14:23:58 -07:00
Solomon Hykes
4088975de9 Merge pull request #2182 from dotcloud/cleanup-dm-unittests 
Clean up better from previous unit-test runs
Upstream-commit: 79c0c4470f095cf30138dd4b5f19ad737497e9bd
Component: engine
 2013-10-14 12:29:59 -07:00
Solomon Hykes
83a87303bf Merge pull request #2183 from dotcloud/migrate-aufs 
Migrate aufs to new device mapper backend
Upstream-commit: 4dedd9a9aac47669df24c9c6c96e2e3a6b28ed0d
Component: engine
 2013-10-14 12:28:28 -07:00
Guillaume J. Charmes
1bca3c7d07 Add error return to cleanup, use os.OpenFile instead of syscall.Open, Make sure the pools are removed after all other devices 
Upstream-commit: ea92dc2e8c42c4387eccf1ebb88e20ccc92c1853
Component: engine
 2013-10-14 12:26:46 -07:00
Solomon Hykes
c072ec522a Change the base filesystem size in unit tests 
Upstream-commit: 48070274ee93bf0d4cef7486a4ec19c4d97ac9ce
Component: engine
 2013-10-12 15:06:53 -07:00
Michael Crosby
a829b7de69 Verbose migration add warning for running container 
Conflicts:
	hack/make.sh
	runtime.go
	runtime_test.go
Upstream-commit: 562e4f1e23a52cff05078f68e21199514ba58250
Component: engine
 2013-10-11 17:11:18 -07:00
Alexander Larsson
53581a197d Clean up better from previous unit-test runs 
This makes sure we unmount existing mounts (as well as removing the
devmapper devices), and it fails with proper logs rather than just
panic()ing.
Upstream-commit: e7986da531568040e0185aafce03cdae2169baac
Component: engine
 2013-10-11 16:42:11 -07:00
Solomon Hykes
715688eb5e Merged master into device-mapper branch 
Upstream-commit: 1804fcba93368b4e115f607e060eb345b0594e62
Component: engine
 2013-10-10 12:50:30 -07:00
Michael Crosby
4d7c2bfb0d Merge pull request #2133 from dotcloud/improve_tests 
Make sure to close the network allocators
Upstream-commit: ded74b0bb37d328a8c1a69f1f9b9aca2bba58199
Component: engine
 2013-10-09 15:45:16 -07:00
Victor Vieux
177e714a8f replace panic by log.Fatal in tests 
Upstream-commit: 823174de4d1acb93613c1b5ba53873906f43f62c
Component: engine
 2013-10-09 13:47:49 +00:00
Guillaume J. Charmes
921ffe0649 Make sure to close the network allocators 
Upstream-commit: 9107565d0634ea3eed3290c6c4b6c0f006fdefe8
Component: engine
 2013-10-08 15:42:02 -07:00
Alexander Larsson
b3baf515e4 Tests: Initialize devicemapper early to avoid it happening in a test 
This can take a while and may cause some tests to timeout
Upstream-commit: aaf1f73bcc2c594f07254a98ff77de3cc6351e92
Component: engine
 2013-10-04 15:47:43 +02:00
Alexander Larsson
c413093856 Be better at cleaning up leftover from earlier test runs 
When running the test inside a docker container we sometimes are left with
leftover device nodes for device mapper devices that no longer exist.
We were panic:ing in this case, but with this change we just remove such
nodes.
Upstream-commit: 7b58e15b08349dba35bf3813f77a0b900c2e4df5
Component: engine
 2013-10-03 19:54:14 +02:00
Victor Vieux
34abbb9020 Add test 
Upstream-commit: 1328be7c299417aa8c8740ac4901a978724afa9b
Component: engine
 2013-10-03 15:21:14 +00:00
Victor Vieux
715ce06407 go fmt and aufs support removed 
Upstream-commit: ebfa24acb08504d8da3fcba8da897fed357f34b2
Component: engine
 2013-09-26 15:40:13 +00:00
Victor Vieux
1812696aef Revert "add a -mount-method flag" 
This reverts commit e52d756f40c9ccf8b37ca496cb72be057c909ed7.
Upstream-commit: 5e1d540209342fa2d6e2ab7117062a897ccf8fe8
Component: engine
 2013-09-26 15:14:03 +00:00
Victor Vieux
4c426bcdc1 add a -mount-method flag 
Upstream-commit: c1e25d7273f7f520a0dbac675db4e7e26c8a4a9b
Component: engine
 2013-09-26 15:10:01 +00:00
Alexander Larsson
71899158fd Tests: Clean up any old devmapper leftovers before starting tests 
Upstream-commit: 03320f0d1c5a687ec46cbf6d836cc91576b3b225
Component: engine
 2013-09-26 15:09:33 +00:00
Alexander Larsson
f35010d2a6 runtime test: Ensure all containers are unmounted at nuke() 
Otherwise we may leave around e.g. devmapper mounts
Upstream-commit: 67788723c99cda8b41e5a488b988e2a72732d684
Component: engine
 2013-09-26 15:09:33 +00:00
Alexander Larsson
51abe008c8 deviceset: Cleanup device sets on test end 
We unmount all mounts and deactivate all device mapper devices to
make sure we're left with no leftovers after the test.
Upstream-commit: c6e8813c979bbea8832f47dc6468e805a1a18c3e
Component: engine
 2013-09-26 15:09:32 +00:00
Alexander Larsson
a4196242f7 Always start tests from a clean set of loopback images 
This way we don't get any issues with leftovers
Upstream-commit: 261b0b01dffde42595d987b609d38c3b6d8368f7
Component: engine
 2013-09-26 15:09:31 +00:00
Alexander Larsson
1c3fa571b9 tests: Store the loopback images for test outside unit-tests 
This directory is copied to each test prefix which is really
slow with the large loopback mounts.
Upstream-commit: a7fd1fce5d6fb29a8c627022da7cbbf0f4b740c7
Component: engine
 2013-09-26 15:09:31 +00:00
Alexander Larsson
1e89c8ec2f Reuse a single DeviceSetDM for all the tests 
We wrap the "real" DeviceSet for each test so that we get only
a single device-mapper pool and loopback mounts, but still
separate out the IDs in the tests. This makes the test run
much faster.
Upstream-commit: d47c18c5fbe50a2ad6ec011704f86a3c27360ff9
Component: engine
 2013-09-26 15:09:31 +00:00
Alexander Larsson
2a4e60c781 Delete corresponding Devices when deleting Images 
If an image is deleted and there is a corresponding device
for that image we also delete the image.
Upstream-commit: 3f3f5f0bbaafc67d3f77b920194f8d7bfb7bf6ee
Component: engine
 2013-09-26 15:09:31 +00:00
Alexander Larsson
19e1e13936 Runtime: Add DeviceSet singleton 
This adds a DeviceSet singleton to the Runtime object which will be used for
any DeviceMapper dependent code.
Upstream-commit: f317a6b6fe31685445ac97a1475136c5ab7860b5
Component: engine
 2013-09-26 15:08:54 +00:00
Michael Crosby
0d8ea16762 Merge pull request #1759 from bdon/graph-map 
Minor refactor of Graph; replace uses of Graph.All (slice) with Graph.Map (map)
Upstream-commit: ad152efbed6ddb74a352c39147bae9b0e8c87435
Component: engine
 2013-09-10 08:49:11 -07:00
Solomon Hykes
aa0ad01db6 Merge builder.go into runtime.go 
Upstream-commit: 24e02043a2672320abebc3bd5fa6a592e2ebd082
Component: engine
 2013-09-06 17:33:05 -07:00
Brandon Liu
c7e2ec175d Replace Graph.All with Graph.Map 
Upstream-commit: 1fca99ad908c530fcd03158a56767b55500a8521
Component: engine
 2013-08-31 20:44:42 -07:00
Victor Vieux
6b54138e54 use init function 
Upstream-commit: 740a97f1a836be17ab39e8496b7372900782c20b
Component: engine
 2013-08-29 22:55:29 +00:00
shin-
b2a84c3f0c Fixed: ImagePull in runtime test 
Upstream-commit: 1c6af604e824d8fa2896c4906f05a0a3729c8e52
Component: engine
 2013-08-23 04:32:09 +02:00
Guillaume J. Charmes
00a7cbd80b Merge pull request #1290 from dotcloud/parallel_pull 
* Runtime: Parallel pull
Upstream-commit: e54e8fa9205409e741a64c7d7746e2e548c52fc0
Component: engine
 2013-08-05 14:17:29 -07:00
Guillaume J. Charmes
0c11df3e01 Merge pull request #1267 from sridatta/new-clean-init 
* Runtime: Fix to "Inject dockerinit at /.dockerinit"
Upstream-commit: f6fa353dd8be732aaed20f0c64a5ae8ccc9f1dbc
Component: engine
 2013-08-05 13:23:22 -07:00