b75aa9ace9
Change bundle order, and fix shell array expansion.
...
I believe that it is helpful to build the binary first. That way,
if you interrupt the tests, you still get a binary to play with.
If you run the tests first and interrupt them, no binary for you!
Also, the second part of this commit is an undeniable proof that
Bash array syntax is nothing else than an elaborate troll by Bash
authors.
Upstream-commit: 85956c70b5613439d9f239550c5c4ec360339cb6
Component: engine
2013-10-17 23:20:18 -07:00
70d38dc0d4
Remove spurious messages, and use proper args expansion.
...
Also, display some (hopefully helpful) message when no command was given.
Upstream-commit: 8c38c309851c2a44b9c12bac8f29bc011ea4040f
Component: engine
2013-10-17 23:19:36 -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
40ae0bfbb2
Work around an exotic bug affecting Docker-in-Docker + systemd.
...
Upstream-commit: 255b6aadfacfd346ef413a1ffd945360276cbcf6
Component: engine
2013-10-17 20:42:11 -07: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
0a62aaa3b1
clean split between errors and output. JSON output always valid
...
Upstream-commit: 8bce284496e60231ac2e82fc023ff1faadff6aa5
Component: engine
2013-10-17 23:40:43 +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
b73b1d5688
Update hack/release.sh process to automatically invoke hack/make.sh and bail on building/testing issues
...
Upstream-commit: 83a2e92d47bc1d78a44b9508656725a043f08b6b
Component: engine
2013-10-17 16:49:35 -06: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
71320cc1e8
Re #2137 Note about vagrant dns in the test documentation
...
Upstream-commit: 3db381bf086215ff9d29cf55cb55d7fa086f990d
Component: engine
2013-10-17 13:38:39 -07:00
fe7c7ab666
Update CHANGELOG.md
...
Upstream-commit: 47cc6c808161057f3a04f090dc01f32da2132b47
Component: engine
2013-10-17 11:26:17 -07:00
82851ecb8f
Add initial init scripts library, including systemd, sysvinit, upstart, and openrc
...
Upstream-commit: c405d53b6e6658b1cbe9ad7ba52ea6dc9330f546
Component: engine
2013-10-17 12:03:49 -06: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
438bef9430
c&p improvement for 13.04
...
first line killed sources list
Upstream-commit: bc39ac71e66327aa73c44633b374ef75630909dc
Component: engine
2013-10-17 10:07:12 +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
e2a6017ff6
make copy paste user friendly
...
copying only the first line killed my sources.list file
Upstream-commit: 2110b3cca80da253d2fd7443480509a3b58a19e2
Component: engine
2013-10-17 09:31:35 +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
2ce8125dd1
Bump version to 0.6.4
...
Upstream-commit: e8da76605f11c10d964c251a944ca5cbcdf1518a
Component: engine
2013-10-16 17:50:08 -07:00
ff708a52c9
Merge pull request #2242 from jpetazzo/remove-spurious-errors-and-errclosedpipe
...
Fix error/debug messages in Container.Attach and recover from ErrClosedPipe
Upstream-commit: 3ba989378692e90d3f06ab087b814fcf1a8eacd9
Component: engine
2013-10-16 17:27:23 -07:00
04a26ac7f0
Try a different presentation of infrastructure documentation.
...
Upstream-commit: 7b1c6ccabd1c1276c80abc1e818b45804a5d05ed
Component: engine
2013-10-16 17:11:21 -07:00
1dde114e36
devmapper: debug messages
...
Upstream-commit: c688e9b5a61c1979d497cfe9cba0a6099aad63e8
Component: engine
2013-10-16 23:27:33 +00:00
38810afde9
hack: cleanup devicemapper at the last test
...
Upstream-commit: f3e6d34df23adf84f520b058e4363f8b789d2ebf
Component: engine
2013-10-16 23:27:00 +00:00
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
45b9d24be0
devicemapper: remove unused code
...
Upstream-commit: 153248b60f551d4cb92bce4f35b08084f554c62c
Component: engine
2013-10-16 23:23:35 +00:00
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
8150e959e4
discard errno = 0 errors
...
Upstream-commit: 49c62879b8e3df0f0126b8ad844509bb79e016e5
Component: engine
2013-10-16 23:05:50 +00:00
4e221a5f03
Merge pull request #2246 from dotcloud/clean_when_start_fail
...
Add cleanup when container.Start fails
Upstream-commit: 34745ee0f4d487fd1eb6c6e1cdac1672deb26658
Component: engine
2013-10-16 15:06:08 -07:00
9d55c0e3cd
Merge pull request #2251 from dotcloud/skip_autoremove_test
...
skip auto-remove test for now
Upstream-commit: d21bd5b96493220ed61a62fa9366055a81f41721
Component: engine
2013-10-16 14:59:08 -07:00
e2c3019026
Merge pull request #2249 from jpetazzo/cleanup-errclosing-in-proxy
...
Catch errClosing error when TCP and UDP proxies are terminated.
Upstream-commit: 82220ea2add4bc829ea47e63f0d4724a2a59b808
Component: engine
2013-10-16 14:51:43 -07:00
9ca3eddef5
skip auto-remove test for now
...
Upstream-commit: 655b16c712f1112949ab0f694a12c4b3c7924498
Component: engine
2013-10-16 21:47:20 +00:00
