002ca069aa
Merge pull request #2263 from tianon/hack-release
...
Update hack/release.sh process to automatically invoke hack/make.sh and bail on building/testing issues
Upstream-commit: f0dbdba5c00f988da893627fe7b9d54b95bc7157
Component: engine
2013-10-23 15:31:16 -07:00
bab3ffd21b
Merge pull request #2226 from tianon/init
...
Add initial init scripts library and better/safer Ubuntu packaging that works for Debian, too
Upstream-commit: ef5cf6c1ec88c71465075f272e58150ae26d25fa
Component: engine
2013-10-23 14:29:41 -07:00
6a3e04b0eb
Merge pull request #2306 from tianon/fix-ubuntu-install-aufs
...
Update hack/install.sh with some more Ubuntu-specific installation stuff...
Upstream-commit: afaddd04f77b1296ed42a2753d43e59d43d8cc35
Component: engine
2013-10-23 14:22:55 -07:00
40ad755eae
Merge pull request #2327 from dotcloud/2325_fix_untag_rmi
...
fix wrong untag while docker rmi
Upstream-commit: 7a116220e79b7ef8116c4726dced2a25ecc0873c
Component: engine
2013-10-23 10:24:20 -07:00
6c2f704b07
Merge pull request #2349 from shykes/runtime-cleanup
...
Runtime: remove unused field kernelVersion
Upstream-commit: 894a68d2ee957d75d599bf8e704ffa717212cf0f
Component: engine
2013-10-23 09:54:00 -07:00
47b8397b61
mkimage-debootstrap.sh: Add -p option to invoke debootstrap with http_proxy.
...
This patch allows debootstrap to be run with the http_proxy environment
variable. This is principally useful when you're using apt-cacher and
apt-cacher-ng locally.
Upstream-commit: bc8a1081b047f6ee4ebf0adb22695fe3c98425c6
Component: engine
2013-10-24 03:21:10 +11: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
2013-10-23 07:38:12 -06:00
0d8e2ee2ed
Runtime: remove unused field kernelVersion
...
Upstream-commit: 7e4d00840392a80c0946291848c4caa18a5ec108
Component: engine
2013-10-23 00:44:57 -06:00
1050f660ec
Merge pull request #2279 from dotcloud/fix_docker_inspect
...
Client: improve docker inspect
Upstream-commit: b0515a7016d9be58e989401f65645af756d904ef
Component: engine
2013-10-22 17:17:35 -07:00
5c37701dc5
Merge pull request #2341 from dotcloud/1327-race_build_verbose-fix
...
fix race condition in docker build with verbose + cleanup hostIntegration debug
Upstream-commit: 8ff7b70c91387a0e868371b2b4055f57a26a057e
Component: engine
2013-10-22 16:46:36 -07:00
5658c0e9c4
fix status code
...
Upstream-commit: 01284cbf7350d1b4537e83ddd60274afccf32ecf
Component: engine
2013-10-22 15:39:51 -07:00
d8ab9dfa35
fix race condition in docker build with verbose + cleanup hostIntegration debug
...
Upstream-commit: 10e10c9573a0f20243212192fa782feb35651b18
Component: engine
2013-10-22 15:01:06 -07:00
92782b4f08
registry: fix content-type for PushImageJSONIndex
...
Upstream-commit: d93023daa9db2b6d38f7eefc8611e8226d75bbaf
Component: engine
2013-10-22 11:56:48 -07:00
185088440f
Merge pull request #2261 from edmund-wagner/master
...
make copy paste user friendly
Upstream-commit: 81866087fe6260eccfd9490f990ad01fec911b15
Component: engine
2013-10-22 11:31:49 -07:00
e3e02821f6
Merge pull request #2150 from pnasrat/fix-mnt-subdir-volumes
...
Fixes issues with mounting subdirectories of /mnt in container.
Upstream-commit: e70030a0c347b2fe8a8ea7b92fab3dde6b928f3b
Component: engine
2013-10-22 11:26:50 -07:00
f2236c43dc
Merge pull request #2318 from Tranquility/master
...
Fix github link in docs
Upstream-commit: 3bd45824da739d98745193e68c15e85edbbb7b60
Component: engine
2013-10-22 09:55:33 -07:00
86b2904f93
Merge pull request #2198 from hamo/hamo/chdir_error
...
check return value of syscall.Chdir when changing working directory
Upstream-commit: 13c913d883a8d26f18de4a833786a5bb305d3d94
Component: engine
2013-10-22 09:54:25 -07:00
01e56b8651
Merge pull request #2326 from justinforce/commentstring
...
Set commentstring in Vim syntax plugin
Upstream-commit: 92beaed06601a799ef927ab7222415e25e684415
Component: engine
2013-10-22 00:41:34 -07:00
b0bd7be583
Merge pull request #2307 from gurjeet/sorted_commands_in_help
...
Place 'top' subcommand's help in proper order.
Upstream-commit: 6b04913e730b6ae11c7ec6a63820b41d429071a9
Component: engine
2013-10-21 18:07:39 -07:00
9e9829e4a7
fix wrong untag while docker rmi
...
Upstream-commit: 93810b289c6c8394061da41a59f7fa5c655be0d7
Component: engine
2013-10-21 17:03:32 -07:00
22344a9b8e
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.
Upstream-commit: ea59ce60c5fc40e6708c22cf90d7cce08d12e294
Component: engine
2013-10-21 16:15:10 -07:00
fcf658a6b5
Clean up level 3 headers.
...
Upstream-commit: a1fc8e17a79818977375d5e97a1afdc5f2d2fca8
Component: engine
2013-10-21 14:03:09 -07:00
4785dd0921
Fix github link in docs
...
Upstream-commit: f903feee03d4df4361c79a44b6f5d78d4718b350
Component: engine
2013-10-21 22:58:56 +02:00
b3abc383b4
Place 'top' subcommand's help in proper order.
...
Upstream-commit: 7e09c6332de11538e170b4d25ccd5bfa068ffd1e
Component: engine
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
2013-10-19 23:56:14 -06:00
8f6b16d850
Fix #2302
...
Upstream-commit: bba5fd455567f831270ff60bd6991481d5340958
Component: engine
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
2013-10-18 16:26:29 -07:00
d6470d0bf3
Fix issue with autoremove
...
Upstream-commit: e7269b98416e8228930dde9461bfcad38eeb2c56
Component: engine
2013-10-18 16:26:29 -07:00
295b7a4df7
Update documentation
...
Upstream-commit: 8cf0f2dbe54e5ff5175a830af30ba428f8b1f526
Component: engine
2013-10-18 16:26:29 -07:00
fbbaaa37c7
Fix attach race condition, improve unit tests, make sure the container is started before unblocking Start
...
Upstream-commit: 3e014aa6624bdc3411bb6f5bc2c297e45a47ad68
Component: engine
2013-10-18 16:26:16 -07:00
b3613b29c9
Fix issue killing container while sending signal
...
Fix rebase issue
Update docs
Upstream-commit: 333bc23f21e8423d3085632db99a6d1df227c5f1
Component: engine
2013-10-18 16:19:27 -07: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
2013-10-18 16:16:29 -07: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
2013-10-18 16:16:29 -07:00
4b6a99ff24
Merge pull request #2222 from tianon/debootstrap
...
Renamed and refactored mkimage-debian to mkimage-debootstrap to more clearly reflect its true function
Upstream-commit: 4b7c071e9c1f2ec839e2d4f5be915850405a8686
Component: engine
2013-10-18 14:46:14 -07:00
0e0977a62e
Merge pull request #2281 from metalivedev/cleanupformat
...
Clean up build warnings. Remove redundant files.
Upstream-commit: ad7c6bc9507d69db4cf13aaf6386c474bf492962
Component: engine
2013-10-18 11:39:46 -07:00
02ebda558b
Merge pull request #2282 from shykes/fix-tests
...
Tests: Cleanup the test suite
Upstream-commit: 2e4ee72201bf7c853266e0c7959fb9f080eccfc2
Component: engine
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
2013-10-18 12:18:13 -06:00
d53bf7553c
hack: encode the name of the current test in temporary directories, for easier tracking
...
Conflicts:
utils_test.go
Upstream-commit: b629810fe08dc864674a6e64a7f1b418096bc448
Component: engine
2013-10-18 07:29:07 +00:00
21aae43f3a
Increase readbility of unit tests by using mkRuntime everywhere
...
Upstream-commit: 07d9e4353bc199db7abb52b4b4bba1c2feb75c1a
Component: engine
2013-10-18 07:20:39 +00:00
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
b7d138e4ad
Use heredoc to make expect script more clear
...
Upstream-commit: f34a62ea19b477bbaa74a09c04d5e8faf67c44a2
Component: engine
2013-10-18 00:35:12 -05: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
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
ce87496ba9
Clean up build warnings. Remove redundant files.
...
Upstream-commit: 689bcd1dc3afdcae5bd45e32541b464fcf3ecbd0
Component: engine
2013-10-17 17:57:01 -07: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
427dad8458
Add Stackbrew.
...
Upstream-commit: d401e9d3ace06d3291ddd96a8ab8aa690d5935dc
Component: engine
2013-10-17 14:11:10 -07:00
