a5e651dbd2Update hack/make/ubuntu to make less ubuntu-centric packages, to fix the issue of deleting the docker group on every upgrade, to use the new init library scripts for upstart and sysvinit, and to include the dependency on iptables Upstream-commit: 2aaaf9032052af472aaf2eaa1a5b934c9bfeb0a8 Component: engine
Tianon Gravi
2013-10-15 09:38:02 -06:00
4cbb2084bcrefactor utils.ParseHost with switch-case, so we can add other proto support easily Upstream-commit: 99f16755661de79cac1ccda78e3e96552f6a4491 Component: engine
Yang Bai
2013-10-23 18:29:35 +08:00
b0bd7be583Merge pull request #2307 from gurjeet/sorted_commands_in_help
Victor Vieux
2013-10-21 18:07:39 -07:00
9e9829e4a7fix wrong untag while docker rmi Upstream-commit: 93810b289c6c8394061da41a59f7fa5c655be0d7 Component: engine
Victor Vieux
2013-10-21 16:54:02 -07:00
22344a9b8eSet commentstring in Vim syntax plugin
Justin Force
2013-10-21 16:15:10 -07:00
fcf658a6b5Clean up level 3 headers. Upstream-commit: a1fc8e17a79818977375d5e97a1afdc5f2d2fca8 Component: engine
Andy Rothfusz
2013-10-21 14:03:09 -07:00
4785dd0921Fix github link in docs Upstream-commit: f903feee03d4df4361c79a44b6f5d78d4718b350 Component: engine
Ole Reifschneider
2013-10-21 11:30:18 +02:00
fad393274fMerge pull request #2303 from metalivedev/2302-fixintro
Andy Rothfusz
2013-10-21 09:39:34 -07:00
b3abc383b4Place 'top' subcommand's help in proper order. Upstream-commit: 7e09c6332de11538e170b4d25ccd5bfa068ffd1e Component: engine
Gurjeet Singh
2013-10-20 02:15:36 -04:00
5cdd5ff8f0Update 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) Upstream-commit: 3b0cbc59ea4da94cd9013fe60e83919d1a5859aa Component: engine
Tianon Gravi
2013-10-19 23:40:28 -06:00
8802449935testing infrastructure, issue #1800: Refactor docker testing using Docker in Docker Upstream-commit: 95f3f77fc417bbc55f03e869136deec27e26bc51 Component: engine
Daniel Mizyrycki
2013-10-18 22:33:16 -07:00
8f6b16d850Fix#2302 Upstream-commit: bba5fd455567f831270ff60bd6991481d5340958 Component: engine
Andy Rothfusz
2013-10-18 18:00:44 -07:00
cc12d3d32eAdd a chan to hijack() to block until the hijack is completed Upstream-commit: 9bceae244044435647e843ffdd040322507d182b Component: engine
Guillaume J. Charmes
2013-10-10 11:20:50 -07:00
d6470d0bf3Fix issue with autoremove Upstream-commit: e7269b98416e8228930dde9461bfcad38eeb2c56 Component: engine
Guillaume J. Charmes
2013-10-09 14:38:52 -07:00
fbbaaa37c7Fix attach race condition, improve unit tests, make sure the container is started before unblocking Start Upstream-commit: 3e014aa6624bdc3411bb6f5bc2c297e45a47ad68 Component: engine
Guillaume J. Charmes
2013-10-08 18:42:53 -07:00
b3613b29c9Fix issue killing container while sending signal Fix rebase issue Update docs Upstream-commit: 333bc23f21e8423d3085632db99a6d1df227c5f1 Component: engine
Guillaume J. Charmes
2013-10-08 19:15:29 +00:00
9e4d782d8fAdd POSIX shell version of host_integration/manager.go in the style of hack/make.sh Rename host_integration to host-integration for consistency Upstream-commit: 7cf1877098edb7d4874509a338f663d550ef0ede Component: engine
Tianon Gravi
2013-10-04 07:59:06 -06:00
02bbabf14dAdd -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 Upstream-commit: 4918769b1ac2d38f23087b766140e6a7f8979310 Component: engine
Guillaume J. Charmes
2013-09-11 23:50:26 -07:00
f83e69dc32Merge branch 'master' into dm
Guillaume J. Charmes
2013-10-18 12:38:29 -07:00
439158e160Switch back some Errorf to Debugf. Upstream-commit: c2175ae736e6b77119ec92a832e325ec076a1e78 Component: engine
Guillaume J. Charmes
2013-10-18 12:29:16 -07:00
0e0977a62eMerge pull request #2281 from metalivedev/cleanupformat
Andy Rothfusz
2013-10-18 11:39:46 -07:00
02ebda558bMerge pull request #2282 from shykes/fix-tests
Victor Vieux
2013-10-18 11:31:13 -07:00
6bdd999b91Add "vendor/pkg/" to .gitignore now that we "go test -i" Upstream-commit: 4870265a9f07b443fa06df07c50ddd6f13c9f13f Component: engine
Tianon Gravi
2013-10-18 12:18:13 -06:00
e878830be2devmapper: Fix prefix name to work with udev
Alexander Larsson
2013-10-18 11:39:47 +02:00
1357281d03devmapper: Fix major/minor extraction
Alexander Larsson
2013-10-18 11:38:21 +02:00
5be5b89b7adevmapper: use major,minor of underlying device in devmapper device name, for readability. Upstream-commit: 4756ad248a6b8c70a7f4d6cb1aacd6e60e27b1e6 Component: engine
Solomon Hykes
2013-10-18 08:30:53 +00:00
e658fc1a1ddevmapper: clearer make the 'unknown base hash' error message more understandable Upstream-commit: dfb77274cef85c0561d98de2eee8b2562c329d1f Component: engine
Solomon Hykes
2013-10-18 08:22:42 +00:00
f793996ad4Merge remote-tracking branch 'upstream/master'
Roger Peppe
2013-10-18 09:22:20 +01:00
d53bf7553chack: encode the name of the current test in temporary directories, for easier tracking
Solomon Hykes
2013-10-18 06:47:08 +00:00
21aae43f3aIncrease readbility of unit tests by using mkRuntime everywhere Upstream-commit: 07d9e4353bc199db7abb52b4b4bba1c2feb75c1a Component: engine
Solomon Hykes
2013-10-18 06:44:30 +00:00
8069d98b90Merge branch 'dm' of ssh://github.com/dotcloud/docker into dm Upstream-commit: 5e363072f54ec1cf0fdb7feb70cdce38622dcbe0 Component: engine
Solomon Hykes
2013-10-18 06:51:50 +00:00
b73358fb51devmapper: the tests are fast enough that we no longer need a workaround to avoid timeouts Upstream-commit: cad913c57bbd1d9f9b3b2284ee9e2c262734047b Component: engine
Solomon Hykes
2013-10-18 06:48:20 +00:00
cc3628cab5hack: encode the name of the current test in temporary directories, for easier tracking Upstream-commit: 5f58a1fbe4733c1415046d6e16afd17a41b595a8 Component: engine
Solomon Hykes
2013-10-18 06:47:08 +00:00
e20e669277Increase readbility of unit tests by using mkRuntime everywhere Upstream-commit: 07e09d57af29bf9b59945ab2f31c4dc5ab52bb5b Component: engine
Solomon Hykes
2013-10-18 06:44:30 +00:00
4e4f3e50fdhack: fail tests if there are leftover temp files before or after Upstream-commit: 5cd7de5de8fddd5868c6b85ed1e4f46228c82672 Component: engine
Solomon Hykes
2013-10-18 02:32:13 +00:00
06ac81c4b1Hack: don't run integration tests in /var/lib/docker/unit-tests; add missing cleanups in a few tests Upstream-commit: 240d5b3fa1b66f099b71c20ff8dc4ed1ecffc1d3 Component: engine
Solomon Hykes
2013-10-16 20:10:20 +00:00
71320cc1e8Re #2137 Note about vagrant dns in the test documentation Upstream-commit: 3db381bf086215ff9d29cf55cb55d7fa086f990d Component: engine
Peter Braden
2013-10-17 13:38:39 -07:00
cdce39d789Merge pull request #2262 from alexlarsson/dm-dind-use-root-dir
Guillaume J. Charmes
2013-10-17 11:54:40 -07:00
d0feec3427devmapper: prefix device names with the dev_id+inode of the data image Upstream-commit: f1d07e2dbe41a3a4f9b8ee1de544fc9c2de88c60 Component: engine
Solomon Hykes
2013-10-17 01:46:28 +00:00