e702af3a56
Merge pull request #2330 from alexlarsson/dm-fix-change-detection
...
Fix typo that made change detection break
Upstream-commit: 1fe08e004686b25aaf56bc01194629c0b7e658f9
Component: engine
2013-10-22 10:20:53 -07:00
91978e1533
Fix typo that made change detection break
...
We were comparing the old and old mtimes rather than the old and
the new. This meant we missed some file changes where only the mtime
changed.
Upstream-commit: bc1c5ddf2ebbb74dd2e2bc2d4a7a24c75edf6877
Component: engine
2013-10-22 11:13:24 +02:00
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
439158e160
Switch back some Errorf to Debugf.
...
Upstream-commit: c2175ae736e6b77119ec92a832e325ec076a1e78
Component: engine
2013-10-18 12:29:16 -07:00
0e0977a62e
Merge pull request #2281 from metalivedev/cleanupformat
...
Clean up build warnings. Remove redundant files.
Upstream-commit: ad7c6bc9507d69db4cf13aaf6386c474bf492962
Component: engine
2013-10-18 11:39:46 -07:00
02ebda558b
Merge pull request #2282 from shykes/fix-tests
...
Tests: Cleanup the test suite
Upstream-commit: 2e4ee72201bf7c853266e0c7959fb9f080eccfc2
Component: engine
2013-10-18 11:31:13 -07:00
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
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
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
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
d53bf7553c
hack: encode the name of the current test in temporary directories, for easier tracking
...
Conflicts:
utils_test.go
Upstream-commit: b629810fe08dc864674a6e64a7f1b418096bc448
Component: engine
2013-10-18 07:29:07 +00:00
21aae43f3a
Increase readbility of unit tests by using mkRuntime everywhere
...
Upstream-commit: 07d9e4353bc199db7abb52b4b4bba1c2feb75c1a
Component: engine
2013-10-18 07:20:39 +00:00
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
c588125712
devmapper: cleanup error reporting
...
Upstream-commit: 0ad35c67462ce3343b99d40ea78755d2ad92a754
Component: engine
2013-10-18 07:09:13 +00:00
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
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
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
e20e669277
Increase readbility of unit tests by using mkRuntime everywhere
...
Upstream-commit: 07e09d57af29bf9b59945ab2f31c4dc5ab52bb5b
Component: engine
2013-10-18 06:44:30 +00:00
54f8255e5f
Merge pull request #2283 from tmc/master
...
Make mkimage-arch.sh a little more clear
Upstream-commit: 89a2c8e2cd2ddfe6f7874a1c7f063fdda208c580
Component: engine
2013-10-17 23:05:01 -07:00
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
b7d138e4ad
Use heredoc to make expect script more clear
...
Upstream-commit: f34a62ea19b477bbaa74a09c04d5e8faf67c44a2
Component: engine
2013-10-18 00:35:12 -05:00
66093eff84
devmapper: rename deviceset_devmapper.go to deviceset.go
...
Upstream-commit: 85a36b3b53f39e13bba9d69a486758b68301d503
Component: engine
2013-10-18 05:19:22 +00:00
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
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
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
c53c4a96f0
Hack: fix tests which didn't cleanup properly
...
Upstream-commit: 5c175357aaa7e011e3535eeb1ee162450f390b9e
Component: engine
2013-10-18 02:13:36 +00:00
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
1f33220276
devicemapper: Add fixme
...
Upstream-commit: d034aafac7a9db601b8affd61a28c762be6b6c31
Component: engine
2013-10-18 00:58:20 +00:00
ce87496ba9
Clean up build warnings. Remove redundant files.
...
Upstream-commit: 689bcd1dc3afdcae5bd45e32541b464fcf3ecbd0
Component: engine
2013-10-17 17:57:01 -07:00
d24b97a314
devmapper: Rename DeviceSetDM to DeviceSet
...
Upstream-commit: 4bd6021806985b48b872aa9dbe2d0183675eac1d
Component: engine
2013-10-18 00:07:56 +00:00
27c3cb7365
Don't add /.docker-id to the container filesystem
...
Upstream-commit: ed03dbfe82f4481ea3845071606ef25c7ea2ec3e
Component: engine
2013-10-18 00:07:46 +00:00
8e5b6c7d93
Remove race condition caused by double-destroy in 2 tests
...
Upstream-commit: 330062ef723f66ed8a640627f983e586f46df03a
Component: engine
2013-10-17 23:59:59 +00:00
efb1162110
Merge pull request #2253 from jpetazzo/infrastructure-docs
...
Try a different presentation of infrastructure documentation.
Upstream-commit: 95ccb78aa79bb1d8704fe65b09803167b36cd074
Component: engine
2013-10-17 16:17:32 -07:00
5c8226fc06
Add error checking and error messages
...
Upstream-commit: 31b883b07641bfab721a05f0a68629c79b74a058
Component: engine
2013-10-17 15:04:14 -07:00
427dad8458
Add Stackbrew.
...
Upstream-commit: d401e9d3ace06d3291ddd96a8ab8aa690d5935dc
Component: engine
2013-10-17 14:11:10 -07:00
cdce39d789
Merge pull request #2262 from alexlarsson/dm-dind-use-root-dir
...
devicemapper: Use device/inode of the root dir, not the image
Upstream-commit: bdb3b2a88c0379942e3e10f4e44b7d69a96b49d2
Component: engine
2013-10-17 11:54:40 -07:00
fe7c7ab666
Update CHANGELOG.md
...
Upstream-commit: 47cc6c808161057f3a04f090dc01f32da2132b47
Component: engine
2013-10-17 11:26:17 -07:00
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
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
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
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
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
d2fc2c3021
devmapper: error reporting workaround in waitRemove()
...
Upstream-commit: ad2fbd9e873915d9d09685887eb0afe16b9559a4
Component: engine
2013-10-17 01:49:51 +00:00
cff980c7fc
devmapper: small fixes in error reporting
...
Upstream-commit: e5d7472a0d0268957eebbc385005d6b69c442270
Component: engine
2013-10-17 01:49:27 +00:00
379a09a137
devmapper: debug messages
...
Upstream-commit: 7d3c7e2b297badc152213cae1e6a11f64a7691b4
Component: engine
2013-10-17 01:47:03 +00:00
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
0563e530aa
devmapper: add useful comments
...
Upstream-commit: ad968ef3ef54f3161e8e1012f0ef20b8757ac0aa
Component: engine
2013-10-17 01:42:05 +00:00
b4cacdf100
Merge branch 'release'
...
Upstream-commit: 414795856a623991927c14da14bfd49ef470c731
Component: engine
2013-10-16 18:20:04 -07:00
33479248a5
Merge pull request #2255 from dotcloud/bump_0.6.4
...
Bump to 0.6.4
Upstream-commit: 2f74b1c84bb892641643faf05615a80d555ad066
Component: engine
2013-10-16 17:59:45 -07:00
2ce8125dd1
Bump version to 0.6.4
...
Upstream-commit: e8da76605f11c10d964c251a944ca5cbcdf1518a
Component: engine
2013-10-16 17:50:08 -07:00
