Victor Vieux
6b04913e73
Merge pull request #2307 from gurjeet/sorted_commands_in_help
...
Place 'top' subcommand's help in proper order.
2013-10-21 18:07:39 -07:00
Victor Vieux
93810b289c
fix wrong untag while docker rmi
2013-10-21 17:03:32 -07:00
Justin Force
ea59ce60c5
Set commentstring in Vim syntax plugin
...
By setting the commentstring, you support commenting with plugins like tComment.
Now Vim won't default to incorrect `/* */` comments.
2013-10-21 16:15:10 -07:00
Andy Rothfusz
a1fc8e17a7
Clean up level 3 headers.
2013-10-21 14:03:09 -07:00
Ole Reifschneider
f903feee03
Fix github link in docs
2013-10-21 22:58:56 +02:00
Andy Rothfusz
26adda6c31
Merge pull request #2303 from metalivedev/2302-fixintro
...
Fix #2302
2013-10-21 09:39:34 -07:00
Gurjeet Singh
7e09c6332d
Place 'top' subcommand's help in proper order.
2013-10-20 02:15:36 -04:00
Tianon Gravi
3b0cbc59ea
Update hack/install.sh with some more Ubuntu-specific installation stuff while we're still on AUFS (installing linux-image-extra-$(uname -r) when we can't find AUFS to try to find AUFS)
2013-10-19 23:56:14 -06:00
Daniel Mizyrycki
95f3f77fc4
testing infrastructure, issue #1800 : Refactor docker testing using Docker in Docker
2013-10-18 22:33:16 -07:00
Andy Rothfusz
bba5fd4555
Fix #2302
2013-10-18 18:00:44 -07:00
Guillaume J. Charmes
9bceae2440
Add a chan to hijack() to block until the hijack is completed
2013-10-18 16:26:29 -07:00
Guillaume J. Charmes
e7269b9841
Fix issue with autoremove
2013-10-18 16:26:29 -07:00
Andy Rothfusz
8cf0f2dbe5
Update documentation
2013-10-18 16:26:29 -07:00
Guillaume J. Charmes
3e014aa662
Fix attach race condition, improve unit tests, make sure the container is started before unblocking Start
2013-10-18 16:26:16 -07:00
Guillaume J. Charmes
333bc23f21
Fix issue killing container while sending signal
...
Fix rebase issue
Update docs
2013-10-18 16:19:27 -07:00
Tianon Gravi
7cf1877098
Add POSIX shell version of host_integration/manager.go in the style of hack/make.sh
...
Rename host_integration to host-integration for consistency
2013-10-18 16:16:29 -07:00
Guillaume J. Charmes
4918769b1a
Add -nostdin and -proxy to docker attach, allow arbirary signal to be sent via docker kill api endpoint
...
Allow attach from `docker start`
Add host integration script generation
Update doc with host integration
2013-10-18 16:16:29 -07:00
Tianon Gravi
4b7c071e9c
Merge pull request #2222 from tianon/debootstrap
...
Renamed and refactored mkimage-debian to mkimage-debootstrap to more clearly reflect its true function
2013-10-18 14:46:14 -07:00
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