Commit Graph

  • 47b8397b61 mkimage-debootstrap.sh: Add -p option to invoke debootstrap with http_proxy. Will Rouesnel 2013-10-23 19:59:20 +11:00
  • ce1466ed6d Typo in host integration docs Upstream-commit: 33ccd29ae7b6e9c8e5b463c7066426f825c74d0a Component: engine Greg Thornton 2013-10-23 10:19:12 -05:00
  • a5e651dbd2 Update 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
  • 4cbb2084bc refactor 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
  • 0d8e2ee2ed Runtime: remove unused field kernelVersion Upstream-commit: 7e4d00840392a80c0946291848c4caa18a5ec108 Component: engine Solomon Hykes 2013-10-23 00:44:57 -06:00
  • 1050f660ec Merge pull request #2279 from dotcloud/fix_docker_inspect Victor Vieux 2013-10-22 17:17:35 -07:00
  • 5c37701dc5 Merge pull request #2341 from dotcloud/1327-race_build_verbose-fix Victor Vieux 2013-10-22 16:46:36 -07:00
  • 5658c0e9c4 fix status code Upstream-commit: 01284cbf7350d1b4537e83ddd60274afccf32ecf Component: engine Victor Vieux 2013-10-17 23:45:18 +00:00
  • d8ab9dfa35 fix race condition in docker build with verbose + cleanup hostIntegration debug Upstream-commit: 10e10c9573a0f20243212192fa782feb35651b18 Component: engine Victor Vieux 2013-10-22 15:01:06 -07:00
  • 976a5606b2 Merge pull request #2338 from proppy/patch-1 Michael Crosby 2013-10-22 14:48:12 -07:00
  • 92782b4f08 registry: fix content-type for PushImageJSONIndex Upstream-commit: d93023daa9db2b6d38f7eefc8611e8226d75bbaf Component: engine Johan Euphrosine 2013-10-22 11:56:48 -07:00
  • 185088440f Merge pull request #2261 from edmund-wagner/master Andy Rothfusz 2013-10-22 11:31:49 -07:00
  • e3e02821f6 Merge pull request #2150 from pnasrat/fix-mnt-subdir-volumes Michael Crosby 2013-10-22 11:26:50 -07:00
  • e702af3a56 Merge pull request #2330 from alexlarsson/dm-fix-change-detection Victor Vieux 2013-10-22 10:20:53 -07:00
  • f2236c43dc Merge pull request #2318 from Tranquility/master Andy Rothfusz 2013-10-22 09:55:33 -07:00
  • 86b2904f93 Merge pull request #2198 from hamo/hamo/chdir_error Victor Vieux 2013-10-22 09:54:25 -07:00
  • 91978e1533 Fix typo that made change detection break Alexander Larsson 2013-10-22 11:13:24 +02:00
  • 01e56b8651 Merge pull request #2326 from justinforce/commentstring Tianon Gravi 2013-10-22 00:41:34 -07:00
  • b0bd7be583 Merge pull request #2307 from gurjeet/sorted_commands_in_help Victor Vieux 2013-10-21 18:07:39 -07:00
  • 9e9829e4a7 fix wrong untag while docker rmi Upstream-commit: 93810b289c6c8394061da41a59f7fa5c655be0d7 Component: engine Victor Vieux 2013-10-21 16:54:02 -07:00
  • 22344a9b8e Set commentstring in Vim syntax plugin Justin Force 2013-10-21 16:15:10 -07:00
  • fcf658a6b5 Clean up level 3 headers. Upstream-commit: a1fc8e17a79818977375d5e97a1afdc5f2d2fca8 Component: engine Andy Rothfusz 2013-10-21 14:03:09 -07:00
  • 4785dd0921 Fix github link in docs Upstream-commit: f903feee03d4df4361c79a44b6f5d78d4718b350 Component: engine Ole Reifschneider 2013-10-21 11:30:18 +02:00
  • fad393274f Merge pull request #2303 from metalivedev/2302-fixintro Andy Rothfusz 2013-10-21 09:39:34 -07:00
  • b3abc383b4 Place 'top' subcommand's help in proper order. Upstream-commit: 7e09c6332de11538e170b4d25ccd5bfa068ffd1e Component: engine Gurjeet Singh 2013-10-20 02:15:36 -04:00
  • 5cdd5ff8f0 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) Upstream-commit: 3b0cbc59ea4da94cd9013fe60e83919d1a5859aa Component: engine Tianon Gravi 2013-10-19 23:40:28 -06:00
  • 8802449935 testing 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
  • 8f6b16d850 Fix #2302 Upstream-commit: bba5fd455567f831270ff60bd6991481d5340958 Component: engine Andy Rothfusz 2013-10-18 18:00:44 -07:00
  • cc12d3d32e Add 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
  • d6470d0bf3 Fix issue with autoremove Upstream-commit: e7269b98416e8228930dde9461bfcad38eeb2c56 Component: engine Guillaume J. Charmes 2013-10-09 14:38:52 -07:00
  • 295b7a4df7 Update documentation Upstream-commit: 8cf0f2dbe54e5ff5175a830af30ba428f8b1f526 Component: engine Andy Rothfusz 2013-10-09 12:31:40 -07:00
  • fbbaaa37c7 Fix 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
  • b3613b29c9 Fix 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
  • 9e4d782d8f Add 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
  • 02bbabf14d 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 Upstream-commit: 4918769b1ac2d38f23087b766140e6a7f8979310 Component: engine Guillaume J. Charmes 2013-09-11 23:50:26 -07:00
  • 4b6a99ff24 Merge pull request #2222 from tianon/debootstrap Tianon Gravi 2013-10-18 14:46:14 -07:00
  • f83e69dc32 Merge branch 'master' into dm Guillaume J. Charmes 2013-10-18 12:38:29 -07:00
  • 439158e160 Switch back some Errorf to Debugf. Upstream-commit: c2175ae736e6b77119ec92a832e325ec076a1e78 Component: engine Guillaume J. Charmes 2013-10-18 12:29:16 -07:00
  • 0e0977a62e Merge pull request #2281 from metalivedev/cleanupformat Andy Rothfusz 2013-10-18 11:39:46 -07:00
  • 02ebda558b Merge pull request #2282 from shykes/fix-tests Victor Vieux 2013-10-18 11:31:13 -07:00
  • 6bdd999b91 Add "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
  • e878830be2 devmapper: Fix prefix name to work with udev Alexander Larsson 2013-10-18 11:39:47 +02:00
  • 1357281d03 devmapper: Fix major/minor extraction Alexander Larsson 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 Solomon Hykes 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 Solomon Hykes 2013-10-18 08:22:42 +00:00
  • f793996ad4 Merge remote-tracking branch 'upstream/master' Roger Peppe 2013-10-18 09:22:20 +01:00
  • d53bf7553c hack: encode the name of the current test in temporary directories, for easier tracking Solomon Hykes 2013-10-18 06:47:08 +00:00
  • 21aae43f3a Increase readbility of unit tests by using mkRuntime everywhere Upstream-commit: 07d9e4353bc199db7abb52b4b4bba1c2feb75c1a Component: engine Solomon Hykes 2013-10-18 06:44:30 +00:00
  • 89f16d267d Merge remote-tracking branch 'alexlarsson/dm-status' into dm Solomon Hykes 2013-10-18 07:17:13 +00:00
  • c588125712 devmapper: cleanup error reporting Upstream-commit: 0ad35c67462ce3343b99d40ea78755d2ad92a754 Component: engine Solomon Hykes 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 Solomon Hykes 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 Solomon Hykes 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 Solomon Hykes 2013-10-18 06:47:08 +00:00
  • e20e669277 Increase readbility of unit tests by using mkRuntime everywhere Upstream-commit: 07e09d57af29bf9b59945ab2f31c4dc5ab52bb5b Component: engine Solomon Hykes 2013-10-18 06:44:30 +00:00
  • d1f6497ecd Merge pull request #1 from jpetazzo/cherry-on-top-of-hack-release Tianon Gravi 2013-10-17 23:21:41 -07:00
  • b75aa9ace9 Change bundle order, and fix shell array expansion. Jérôme Petazzoni 2013-10-17 20:33:34 -07:00
  • 70d38dc0d4 Remove spurious messages, and use proper args expansion. Jérôme Petazzoni 2013-10-17 20:33:14 -07:00
  • 54f8255e5f Merge pull request #2283 from tmc/master Tianon Gravi 2013-10-17 23:05:01 -07:00
  • c3b863ceed Merge pull request #2269 from alexlarsson/dm-blocksize Solomon Hykes 2013-10-17 22:50:33 -07:00
  • b7d138e4ad Use heredoc to make expect script more clear Upstream-commit: f34a62ea19b477bbaa74a09c04d5e8faf67c44a2 Component: engine Travis Cline 2013-10-18 00:34:29 -05:00
  • 66093eff84 devmapper: rename deviceset_devmapper.go to deviceset.go Upstream-commit: 85a36b3b53f39e13bba9d69a486758b68301d503 Component: engine Solomon Hykes 2013-10-18 05:19:22 +00:00
  • 40ae0bfbb2 Work around an exotic bug affecting Docker-in-Docker + systemd. Upstream-commit: 255b6aadfacfd346ef413a1ffd945360276cbcf6 Component: engine Jérôme Petazzoni 2013-10-17 20:32:23 -07:00
  • 19207ea5e6 Merge remote-tracking branch 'alexlarsson/dm-readonly-images' into dm Solomon Hykes 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 Solomon Hykes 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 Solomon Hykes 2013-10-18 02:32:13 +00:00
  • c53c4a96f0 Hack: fix tests which didn't cleanup properly Upstream-commit: 5c175357aaa7e011e3535eeb1ee162450f390b9e Component: engine Solomon Hykes 2013-10-16 20:44:15 +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 Solomon Hykes 2013-10-16 20:10:20 +00:00
  • 1f33220276 devicemapper: Add fixme Upstream-commit: d034aafac7a9db601b8affd61a28c762be6b6c31 Component: engine Solomon Hykes 2013-10-18 00:58:20 +00:00
  • ce87496ba9 Clean up build warnings. Remove redundant files. Upstream-commit: 689bcd1dc3afdcae5bd45e32541b464fcf3ecbd0 Component: engine Andy Rothfusz 2013-10-17 17:57:01 -07:00
  • d24b97a314 devmapper: Rename DeviceSetDM to DeviceSet Upstream-commit: 4bd6021806985b48b872aa9dbe2d0183675eac1d Component: engine Solomon Hykes 2013-10-18 00:07:34 +00:00
  • 27c3cb7365 Don't add /.docker-id to the container filesystem Upstream-commit: ed03dbfe82f4481ea3845071606ef25c7ea2ec3e Component: engine Solomon Hykes 2013-10-18 00:01:29 +00:00
  • 8e5b6c7d93 Remove race condition caused by double-destroy in 2 tests Upstream-commit: 330062ef723f66ed8a640627f983e586f46df03a Component: engine Solomon Hykes 2013-10-17 23:59:59 +00:00
  • 0a62aaa3b1 clean split between errors and output. JSON output always valid Upstream-commit: 8bce284496e60231ac2e82fc023ff1faadff6aa5 Component: engine Victor Vieux 2013-10-17 23:40:43 +00:00
  • efb1162110 Merge pull request #2253 from jpetazzo/infrastructure-docs Jérôme Petazzoni 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 Tianon Gravi 2013-10-17 02:08:14 -06:00
  • 5c8226fc06 Add error checking and error messages Upstream-commit: 31b883b07641bfab721a05f0a68629c79b74a058 Component: engine Guillaume J. Charmes 2013-10-17 15:04:14 -07:00
  • 427dad8458 Add Stackbrew. Upstream-commit: d401e9d3ace06d3291ddd96a8ab8aa690d5935dc Component: engine Jérôme Petazzoni 2013-10-17 14:11:10 -07:00
  • 71320cc1e8 Re #2137 Note about vagrant dns in the test documentation Upstream-commit: 3db381bf086215ff9d29cf55cb55d7fa086f990d Component: engine Peter Braden 2013-10-17 13:38:39 -07:00
  • cdce39d789 Merge pull request #2262 from alexlarsson/dm-dind-use-root-dir Guillaume J. Charmes 2013-10-17 11:54:40 -07:00
  • 1e82bca350 Update CHANGELOG.md Upstream-commit: f248a8e13cbde9498a79a902c3d326bf2021e181 Component: engine Victor Vieux 2013-10-17 11:27:44 -07:00
  • fe7c7ab666 Update CHANGELOG.md Upstream-commit: 47cc6c808161057f3a04f090dc01f32da2132b47 Component: engine Victor Vieux 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 Tianon Gravi 2013-10-15 09:37:18 -06:00
  • efce3d8602 Devmapper: Mount images readonly when calculating changes Alexander Larsson 2013-10-17 16:14:53 +02:00
  • 17a97293a6 devmapper: Use a smaller blocksize for the thin-pool Alexander Larsson 2013-10-17 15:33:00 +02:00
  • 3972ff1232 Show devicemapper status in "docker info" Alexander Larsson 2013-10-17 11:16:50 +02:00
  • 79b5685703 TarFilter: Fix leak of tmpfiles Alexander Larsson 2013-10-17 14:46:58 +02:00
  • 438bef9430 c&p improvement for 13.04 Edmund Wagner 2013-10-17 10:07:12 +02:00
  • 9f21580deb devicemapper: Use device/inode of the root dir, not the image Alexander Larsson 2013-10-17 09:53:09 +02:00
  • e2a6017ff6 make copy paste user friendly Edmund Wagner 2013-10-17 09:31:35 +02:00
  • d2fc2c3021 devmapper: error reporting workaround in waitRemove() Upstream-commit: ad2fbd9e873915d9d09685887eb0afe16b9559a4 Component: engine Solomon Hykes 2013-10-17 01:49:51 +00:00
  • cff980c7fc devmapper: small fixes in error reporting Upstream-commit: e5d7472a0d0268957eebbc385005d6b69c442270 Component: engine Solomon Hykes 2013-10-17 01:49:27 +00:00
  • 379a09a137 devmapper: debug messages Upstream-commit: 7d3c7e2b297badc152213cae1e6a11f64a7691b4 Component: engine Solomon Hykes 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 Solomon Hykes 2013-10-17 01:46:28 +00:00
  • 0563e530aa devmapper: add useful comments Upstream-commit: ad968ef3ef54f3161e8e1012f0ef20b8757ac0aa Component: engine Solomon Hykes 2013-10-17 01:42:05 +00:00
  • b4cacdf100 Merge branch 'release' Upstream-commit: 414795856a623991927c14da14bfd49ef470c731 Component: engine Michael Crosby 2013-10-16 18:20:04 -07:00
  • 33479248a5 Merge pull request #2255 from dotcloud/bump_0.6.4 Michael Crosby 2013-10-16 17:59:45 -07:00
  • 2ce8125dd1 Bump version to 0.6.4 Upstream-commit: e8da76605f11c10d964c251a944ca5cbcdf1518a Component: engine Michael Crosby 2013-10-16 17:50:08 -07:00
  • 8f90ec3513 Merge branch 'master' into bump_0.6.4 Upstream-commit: f16e60665bbd62964a0bd216c4d118a28477a3c3 Component: engine Michael Crosby 2013-10-16 17:48:17 -07:00
  • ff708a52c9 Merge pull request #2242 from jpetazzo/remove-spurious-errors-and-errclosedpipe Michael Crosby 2013-10-16 17:27:23 -07:00
  • 04a26ac7f0 Try a different presentation of infrastructure documentation. Upstream-commit: 7b1c6ccabd1c1276c80abc1e818b45804a5d05ed Component: engine Jérôme Petazzoni 2013-10-10 18:22:23 -07:00