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,722 Commits 12 Branches 297 Tags
439158e160b9e060592ea148adf27b800765806d
Commit Graph

3472 Commits

Author SHA1 Message Date
Guillaume J. Charmes
439158e160 Switch back some Errorf to Debugf. 
Upstream-commit: c2175ae736e6b77119ec92a832e325ec076a1e78
Component: engine
 2013-10-18 12:29:16 -07:00
Alexander Larsson
e878830be2 devmapper: Fix prefix name to work with udev 
Udev escapes "," used in device names to 0\x2c which breaks libdevmapper.
Instead use : to escape minor and minor which works.
Upstream-commit: 2812baf3957391bf8871bd56c00a58f4fbc0b715
Component: engine
 2013-10-18 11:39:47 +02:00
Alexander Larsson
1357281d03 devmapper: Fix major/minor extraction 
The way devices are mapped is a bit more complex than before.
This implements the method from new_decode_dev in:
https://github.com/mirrors/linux-2.6/blob/master/include/linux/kdev_t.h

Which is what is needed on kernels > 2.6
Upstream-commit: 572b1fd9be69c20a98d885e18b327031ef4f4b51
Component: engine
 2013-10-18 11:38:21 +02:00
Solomon Hykes
5be5b89b7a devmapper: use major,minor of underlying device in devmapper device name, for readability. 
Upstream-commit: 4756ad248a6b8c70a7f4d6cb1aacd6e60e27b1e6
Component: engine
 2013-10-18 08:30:53 +00:00
Solomon Hykes
e658fc1a1d devmapper: clearer make the 'unknown base hash' error message more understandable 
Upstream-commit: dfb77274cef85c0561d98de2eee8b2562c329d1f
Component: engine
 2013-10-18 08:22:42 +00:00
Solomon Hykes
89f16d267d Merge remote-tracking branch 'alexlarsson/dm-status' into dm 
Conflicts:
	devmapper/deviceset.go
Upstream-commit: 73545199a8e84ebc7e44bf2595c7f7b0e20f04a1
Component: engine
 2013-10-18 07:17:13 +00:00
Solomon Hykes
c588125712 devmapper: cleanup error reporting 
Upstream-commit: 0ad35c67462ce3343b99d40ea78755d2ad92a754
Component: engine
 2013-10-18 07:09:13 +00:00
Solomon Hykes
8069d98b90 Merge branch 'dm' of ssh://github.com/dotcloud/docker into dm 
Upstream-commit: 5e363072f54ec1cf0fdb7feb70cdce38622dcbe0
Component: engine
 2013-10-18 06:51:50 +00: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
cc3628cab5 hack: encode the name of the current test in temporary directories, for easier tracking 
Upstream-commit: 5f58a1fbe4733c1415046d6e16afd17a41b595a8
Component: engine
 2013-10-18 06:47:08 +00:00
Solomon Hykes
e20e669277 Increase readbility of unit tests by using mkRuntime everywhere 
Upstream-commit: 07e09d57af29bf9b59945ab2f31c4dc5ab52bb5b
Component: engine
 2013-10-18 06:44:30 +00:00
Solomon Hykes
c3b863ceed Merge pull request #2269 from alexlarsson/dm-blocksize 
devmapper: Use a smaller blocksize for the thin-pool
Upstream-commit: 9f85a967bb121a5102f2244611a6aa9cf3abb2b3
Component: engine
 2013-10-17 22:50:33 -07:00
Solomon Hykes
66093eff84 devmapper: rename deviceset_devmapper.go to deviceset.go 
Upstream-commit: 85a36b3b53f39e13bba9d69a486758b68301d503
Component: engine
 2013-10-18 05:19:22 +00:00
Solomon Hykes
19207ea5e6 Merge remote-tracking branch 'alexlarsson/dm-readonly-images' into dm 
Conflicts:
	devmapper/deviceset_devmapper.go
Upstream-commit: d3505d836ac98a95b2129206844b6e4d6ad24927
Component: engine
 2013-10-18 03:40:46 +00:00
Solomon Hykes
f6aee57647 Merge remote-tracking branch 'alexlarsson/fix-tar-leak' into dm-correct 
Upstream-commit: c47e93fcbeda6c1c29a95b6d0deb23f5d03a07ed
Component: engine
 2013-10-18 03:32:47 +00:00
Solomon Hykes
4e4f3e50fd hack: fail tests if there are leftover temp files before or after 
Upstream-commit: 5cd7de5de8fddd5868c6b85ed1e4f46228c82672
Component: engine
 2013-10-18 03:31:21 +00:00
Solomon Hykes
1f33220276 devicemapper: Add fixme 
Upstream-commit: d034aafac7a9db601b8affd61a28c762be6b6c31
Component: engine
 2013-10-18 00:58:20 +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
27c3cb7365 Don't add /.docker-id to the container filesystem 
Upstream-commit: ed03dbfe82f4481ea3845071606ef25c7ea2ec3e
Component: engine
 2013-10-18 00:07:46 +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
Alexander Larsson
efce3d8602 Devmapper: Mount images readonly when calculating changes 
There is no need to have this be writable, and there is a chance
that e.g. atime updates will cause writes to the image which is
bad for disk use wrt sharing between all containers.
Upstream-commit: a14496ce891f1f09b10f0459550e8fe095b477b5
Component: engine
 2013-10-17 16:14:53 +02:00
Alexander Larsson
17a97293a6 devmapper: Use a smaller blocksize for the thin-pool 
As per the thin provisioning docs for creating the pool:

   $data_block_size gives the smallest unit of disk space that can be
   allocated at a time expressed in units of 512-byte sectors.
   $data_block_size must be between 128 (64KB) and 2097152 (1GB) and a
   multiple of 128 (64KB). $data_block_size cannot be changed after the
   thin-pool is created. People primarily interested in thin provisioning
   may want to use a value such as 1024 (512KB). People doing lots of
   snapshotting may want a smaller value such as 128 (64KB).

The switch from 512 (which we used before) to 128 (recommended above
for lots of snapshoting) means a simple container creation (based on the
mattdm/fedora:f19 image) adds 1 MB of diskspace rather than 3.6.
This seems more in tune with how docker is typically used.
Upstream-commit: 8abcc8e713fdf6229d65dec23e6e104f8040d704
Component: engine
 2013-10-17 15:33:00 +02:00
Alexander Larsson
3972ff1232 Show devicemapper status in "docker info" 
This shows the current global diskspace use in "docker info"
Upstream-commit: d733cdcebbcb6bc8573e1869b11f0d9116a92892
Component: engine
 2013-10-17 15:32:07 +02:00
Alexander Larsson
79b5685703 TarFilter: Fix leak of tmpfiles 
We were leaking the temporary directory that we create in TarFilter,
because the "tmpDir, err := ioutil.TempDir()" call overrides the
tmpDir in the outer scope with a new locally scoped variable.
This means tmpDir is always "" when the cleanup function is called.

Also, we did not call the atExit() function if CmdStream had an
error early on.

On errors in CmdStream(),
Upstream-commit: 0aee096fd73676e2548e3bf132770f1692ac47dd
Component: engine
 2013-10-17 14:46:58 +02:00
Alexander Larsson
9f21580deb devicemapper: Use device/inode of the root dir, not the image 
This way the devicemapper prefix stays stable even if we're not
using loopback mounted devices.
Upstream-commit: e6a73e65a23163273fa63d54b8f12530f7eef104
Component: engine
 2013-10-17 09:53:09 +02:00
Solomon Hykes
d2fc2c3021 devmapper: error reporting workaround in waitRemove() 
Upstream-commit: ad2fbd9e873915d9d09685887eb0afe16b9559a4
Component: engine
 2013-10-17 01:49:51 +00:00
Solomon Hykes
cff980c7fc devmapper: small fixes in error reporting 
Upstream-commit: e5d7472a0d0268957eebbc385005d6b69c442270
Component: engine
 2013-10-17 01:49:27 +00:00
Solomon Hykes
379a09a137 devmapper: debug messages 
Upstream-commit: 7d3c7e2b297badc152213cae1e6a11f64a7691b4
Component: engine
 2013-10-17 01:47:03 +00:00
Solomon Hykes
d0feec3427 devmapper: prefix device names with the dev_id+inode of the data image 
Upstream-commit: f1d07e2dbe41a3a4f9b8ee1de544fc9c2de88c60
Component: engine
 2013-10-17 01:46:28 +00:00
Solomon Hykes
0563e530aa devmapper: add useful comments 
Upstream-commit: ad968ef3ef54f3161e8e1012f0ef20b8757ac0aa
Component: engine
 2013-10-17 01:42:05 +00:00
Solomon Hykes
1dde114e36 devmapper: debug messages 
Upstream-commit: c688e9b5a61c1979d497cfe9cba0a6099aad63e8
Component: engine
 2013-10-16 23:27:33 +00:00
Solomon Hykes
38810afde9 hack: cleanup devicemapper at the last test 
Upstream-commit: f3e6d34df23adf84f520b058e4363f8b789d2ebf
Component: engine
 2013-10-16 23:27:00 +00:00
Solomon Hykes
43f0475727 devmapper: wait for devices to be effectively removed before returning a successful remove 
Upstream-commit: ea04f3de72ab97c9f9e49e46e049bf0cde58ac55
Component: engine
 2013-10-16 23:26:37 +00:00
Solomon Hykes
45b9d24be0 devicemapper: remove unused code 
Upstream-commit: 153248b60f551d4cb92bce4f35b08084f554c62c
Component: engine
 2013-10-16 23:23:35 +00:00
Solomon Hykes
c659ac4a84 devmapper: wait for devices to be effectively unmounted before removing them 
Upstream-commit: 1711de4b0996a6fd668f1d1ba07901d04f090810
Component: engine
 2013-10-16 23:06:07 +00:00
Solomon Hykes
d7aa3ef25d Add debug messages while testing devicemapper 
Upstream-commit: 11d695a2973d67906145e7f0972b6e693bdaa3f9
Component: engine
 2013-10-16 20:45:59 +00:00
Solomon Hykes
64572038db Hack: fix tests which didn't cleanup properly 
Upstream-commit: acf58362cb957bf4d02af460935a9c5febd112f4
Component: engine
 2013-10-16 20:44:15 +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
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
990549480d Merge branch 'dm-base-hash' into dm 
Upstream-commit: c9f3e54c3148aeaaa668bcdff184e14d016d2613
Component: engine
 2013-10-15 23:09:26 +00:00
Solomon Hykes
560c0ccd10 hack: don't set DEBUG when running tests 
Upstream-commit: 3997b8a923c3e95c14237657f0e2c9301fc5f66d
Component: engine
 2013-10-15 23:07:26 +00:00
Solomon Hykes
242fae9ab3 hack: only run certain tests with TESTFLAGS='-run TestName' make.sh 
Upstream-commit: ec885d91806595add47c793e1e6bb8a4b9e8d100
Component: engine
 2013-10-15 23:06:41 +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
Alexander Larsson
3dc4429624 devmapper: create device nodes 'on create' instead of 'on resume' 
Upstream-commit: 5ebaca7e55e006083e6e9c2782e4f8b421275579
Component: engine
 2013-10-15 21:27:47 +00:00
Solomon Hykes
b68cf98632 Merge pull request #2227 from dotcloud/dm-rename-loopback 
Rename loopback dir to devicemapper
Upstream-commit: 432ff7e3c3be315b475c59310c1d3889f361f744
Component: engine
 2013-10-15 12:23:43 -07: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