Guillaume J. Charmes
e9ee860c91
Merge branch 'master' into dm
...
Conflicts:
Dockerfile
buildfile.go
container.go
hack/make/test
runtime_test.go
utils/utils.go
2013-10-18 12:38:29 -07:00
Guillaume J. Charmes
c2175ae736
Switch back some Errorf to Debugf.
2013-10-18 12:29:16 -07:00
Andy Rothfusz
ad7c6bc950
Merge pull request #2281 from metalivedev/cleanupformat
...
Clean up build warnings. Remove redundant files.
2013-10-18 11:39:46 -07:00
Victor Vieux
2e4ee72201
Merge pull request #2282 from shykes/fix-tests
...
Tests: Cleanup the test suite
2013-10-18 11:31:13 -07:00
Tianon Gravi
4870265a9f
Add "vendor/pkg/" to .gitignore now that we "go test -i"
2013-10-18 12:18:13 -06:00
Alexander Larsson
2812baf395
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.
2013-10-18 11:39:47 +02:00
Alexander Larsson
572b1fd9be
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
2013-10-18 11:38:21 +02:00
Solomon Hykes
4756ad248a
devmapper: use major,minor of underlying device in devmapper device name, for readability.
2013-10-18 08:30:53 +00:00
Solomon Hykes
dfb77274ce
devmapper: clearer make the 'unknown base hash' error message more understandable
2013-10-18 08:22:42 +00:00
Roger Peppe
43fd85eb8f
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
commands.go
2013-10-18 09:22:20 +01:00
Solomon Hykes
b629810fe0
hack: encode the name of the current test in temporary directories, for easier tracking
...
Conflicts:
utils_test.go
2013-10-18 07:29:07 +00:00
Solomon Hykes
07d9e4353b
Increase readbility of unit tests by using mkRuntime everywhere
2013-10-18 07:20:39 +00:00
Solomon Hykes
73545199a8
Merge remote-tracking branch 'alexlarsson/dm-status' into dm
...
Conflicts:
devmapper/deviceset.go
2013-10-18 07:17:13 +00:00
Solomon Hykes
0ad35c6746
devmapper: cleanup error reporting
2013-10-18 07:09:13 +00:00
Solomon Hykes
5e363072f5
Merge branch 'dm' of ssh://github.com/dotcloud/docker into dm
2013-10-18 06:51:50 +00:00
Solomon Hykes
cad913c57b
devmapper: the tests are fast enough that we no longer need a workaround to avoid timeouts
2013-10-18 06:48:20 +00:00
Solomon Hykes
5f58a1fbe4
hack: encode the name of the current test in temporary directories, for easier tracking
2013-10-18 06:47:08 +00:00
Solomon Hykes
07e09d57af
Increase readbility of unit tests by using mkRuntime everywhere
2013-10-18 06:44:30 +00:00
Tianon Gravi
ac5bc86771
Merge pull request #1 from jpetazzo/cherry-on-top-of-hack-release
...
Cherry on top of hack release
2013-10-17 23:21:41 -07:00
Jérôme Petazzoni
85956c70b5
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.
2013-10-17 23:20:18 -07:00
Jérôme Petazzoni
8c38c30985
Remove spurious messages, and use proper args expansion.
...
Also, display some (hopefully helpful) message when no command was given.
2013-10-17 23:19:36 -07:00
Tianon Gravi
89a2c8e2cd
Merge pull request #2283 from tmc/master
...
Make mkimage-arch.sh a little more clear
2013-10-17 23:05:01 -07:00
Solomon Hykes
9f85a967bb
Merge pull request #2269 from alexlarsson/dm-blocksize
...
devmapper: Use a smaller blocksize for the thin-pool
2013-10-17 22:50:33 -07:00
Travis Cline
f34a62ea19
Use heredoc to make expect script more clear
2013-10-18 00:35:12 -05:00
Solomon Hykes
85a36b3b53
devmapper: rename deviceset_devmapper.go to deviceset.go
2013-10-18 05:19:22 +00:00
Jérôme Petazzoni
255b6aadfa
Work around an exotic bug affecting Docker-in-Docker + systemd.
2013-10-17 20:42:11 -07:00
Solomon Hykes
d3505d836a
Merge remote-tracking branch 'alexlarsson/dm-readonly-images' into dm
...
Conflicts:
devmapper/deviceset_devmapper.go
2013-10-18 03:40:46 +00:00
Solomon Hykes
c47e93fcbe
Merge remote-tracking branch 'alexlarsson/fix-tar-leak' into dm-correct
2013-10-18 03:32:47 +00:00
Solomon Hykes
5cd7de5de8
hack: fail tests if there are leftover temp files before or after
2013-10-18 03:31:21 +00:00
Solomon Hykes
5c175357aa
Hack: fix tests which didn't cleanup properly
2013-10-18 02:13:36 +00:00
Solomon Hykes
240d5b3fa1
Hack: don't run integration tests in /var/lib/docker/unit-tests; add missing cleanups in a few tests
2013-10-18 02:13:36 +00:00
Solomon Hykes
d034aafac7
devicemapper: Add fixme
2013-10-18 00:58:20 +00:00
Andy Rothfusz
689bcd1dc3
Clean up build warnings. Remove redundant files.
2013-10-17 17:57:01 -07:00
Solomon Hykes
4bd6021806
devmapper: Rename DeviceSetDM to DeviceSet
2013-10-18 00:07:56 +00:00
Solomon Hykes
ed03dbfe82
Don't add /.docker-id to the container filesystem
2013-10-18 00:07:46 +00:00
Solomon Hykes
330062ef72
Remove race condition caused by double-destroy in 2 tests
2013-10-17 23:59:59 +00:00
Victor Vieux
8bce284496
clean split between errors and output. JSON output always valid
2013-10-17 23:40:43 +00:00
Jérôme Petazzoni
95ccb78aa7
Merge pull request #2253 from jpetazzo/infrastructure-docs
...
Try a different presentation of infrastructure documentation.
2013-10-17 16:17:32 -07:00
Tianon Gravi
83a2e92d47
Update hack/release.sh process to automatically invoke hack/make.sh and bail on building/testing issues
2013-10-17 16:49:35 -06:00
Guillaume J. Charmes
31b883b076
Add error checking and error messages
2013-10-17 15:04:14 -07:00
Jérôme Petazzoni
d401e9d3ac
Add Stackbrew.
2013-10-17 14:11:10 -07:00
Peter Braden
3db381bf08
Re #2137 Note about vagrant dns in the test documentation
2013-10-17 13:38:39 -07:00
Guillaume J. Charmes
bdb3b2a88c
Merge pull request #2262 from alexlarsson/dm-dind-use-root-dir
...
devicemapper: Use device/inode of the root dir, not the image
2013-10-17 11:54:40 -07:00
Victor Vieux
f248a8e13c
Update CHANGELOG.md
2013-10-17 11:27:44 -07:00
Victor Vieux
47cc6c8081
Update CHANGELOG.md
2013-10-17 11:26:17 -07:00
Tianon Gravi
c405d53b6e
Add initial init scripts library, including systemd, sysvinit, upstart, and openrc
2013-10-17 12:03:49 -06:00
Alexander Larsson
a14496ce89
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.
2013-10-17 16:14:53 +02:00
Alexander Larsson
8abcc8e713
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.
2013-10-17 15:33:00 +02:00
Alexander Larsson
d733cdcebb
Show devicemapper status in "docker info"
...
This shows the current global diskspace use in "docker info"
2013-10-17 15:32:07 +02:00
Alexander Larsson
0aee096fd7
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(),
2013-10-17 14:46:58 +02:00