Gurjeet Singh
b3abc383b4
Place 'top' subcommand's help in proper order.
...
Upstream-commit: 7e09c6332de11538e170b4d25ccd5bfa068ffd1e
Component: engine
2013-10-20 02:15:36 -04:00
Tianon Gravi
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
Andy Rothfusz
8f6b16d850
Fix #2302
...
Upstream-commit: bba5fd455567f831270ff60bd6991481d5340958
Component: engine
2013-10-18 18:00:44 -07:00
Guillaume J. Charmes
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
Guillaume J. Charmes
d6470d0bf3
Fix issue with autoremove
...
Upstream-commit: e7269b98416e8228930dde9461bfcad38eeb2c56
Component: engine
2013-10-18 16:26:29 -07:00
Andy Rothfusz
295b7a4df7
Update documentation
...
Upstream-commit: 8cf0f2dbe54e5ff5175a830af30ba428f8b1f526
Component: engine
2013-10-18 16:26:29 -07:00
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Tianon Gravi
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
Guillaume J. Charmes
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
Tianon Gravi
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
Andy Rothfusz
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
Victor Vieux
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
Tianon Gravi
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
Roger Peppe
f793996ad4
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
commands.go
Upstream-commit: 43fd85eb8f1a3eb8f6dcf9dba818fdcc4602e47e
Component: engine
2013-10-18 09:22:20 +01:00
Solomon Hykes
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
Solomon Hykes
21aae43f3a
Increase readbility of unit tests by using mkRuntime everywhere
...
Upstream-commit: 07d9e4353bc199db7abb52b4b4bba1c2feb75c1a
Component: engine
2013-10-18 07:20:39 +00:00
Jérôme Petazzoni
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
Jérôme Petazzoni
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
Travis Cline
b7d138e4ad
Use heredoc to make expect script more clear
...
Upstream-commit: f34a62ea19b477bbaa74a09c04d5e8faf67c44a2
Component: engine
2013-10-18 00:35:12 -05:00
Jérôme Petazzoni
40ae0bfbb2
Work around an exotic bug affecting Docker-in-Docker + systemd.
...
Upstream-commit: 255b6aadfacfd346ef413a1ffd945360276cbcf6
Component: engine
2013-10-17 20:42:11 -07:00
Solomon Hykes
c53c4a96f0
Hack: fix tests which didn't cleanup properly
...
Upstream-commit: 5c175357aaa7e011e3535eeb1ee162450f390b9e
Component: engine
2013-10-18 02:13:36 +00:00
Solomon Hykes
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
Andy Rothfusz
ce87496ba9
Clean up build warnings. Remove redundant files.
...
Upstream-commit: 689bcd1dc3afdcae5bd45e32541b464fcf3ecbd0
Component: engine
2013-10-17 17:57:01 -07:00
Victor Vieux
0a62aaa3b1
clean split between errors and output. JSON output always valid
...
Upstream-commit: 8bce284496e60231ac2e82fc023ff1faadff6aa5
Component: engine
2013-10-17 23:40:43 +00:00
Jérôme Petazzoni
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
Tianon Gravi
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
Jérôme Petazzoni
427dad8458
Add Stackbrew.
...
Upstream-commit: d401e9d3ace06d3291ddd96a8ab8aa690d5935dc
Component: engine
2013-10-17 14:11:10 -07:00
Victor Vieux
fe7c7ab666
Update CHANGELOG.md
...
Upstream-commit: 47cc6c808161057f3a04f090dc01f32da2132b47
Component: engine
2013-10-17 11:26:17 -07:00
Tianon Gravi
82851ecb8f
Add initial init scripts library, including systemd, sysvinit, upstart, and openrc
...
Upstream-commit: c405d53b6e6658b1cbe9ad7ba52ea6dc9330f546
Component: engine
2013-10-17 12:03:49 -06:00
Edmund Wagner
438bef9430
c&p improvement for 13.04
...
first line killed sources list
Upstream-commit: bc39ac71e66327aa73c44633b374ef75630909dc
Component: engine
2013-10-17 10:07:12 +02:00
Edmund Wagner
e2a6017ff6
make copy paste user friendly
...
copying only the first line killed my sources.list file
Upstream-commit: 2110b3cca80da253d2fd7443480509a3b58a19e2
Component: engine
2013-10-17 09:31:35 +02:00
Michael Crosby
b4cacdf100
Merge branch 'release'
...
Upstream-commit: 414795856a623991927c14da14bfd49ef470c731
Component: engine
2013-10-16 18:20:04 -07:00
Michael Crosby
2ce8125dd1
Bump version to 0.6.4
...
Upstream-commit: e8da76605f11c10d964c251a944ca5cbcdf1518a
Component: engine
2013-10-16 17:50:08 -07:00
Michael Crosby
ff708a52c9
Merge pull request #2242 from jpetazzo/remove-spurious-errors-and-errclosedpipe
...
Fix error/debug messages in Container.Attach and recover from ErrClosedPipe
Upstream-commit: 3ba989378692e90d3f06ab087b814fcf1a8eacd9
Component: engine
2013-10-16 17:27:23 -07:00
Jérôme Petazzoni
04a26ac7f0
Try a different presentation of infrastructure documentation.
...
Upstream-commit: 7b1c6ccabd1c1276c80abc1e818b45804a5d05ed
Component: engine
2013-10-16 17:11:21 -07:00
Victor Vieux
8150e959e4
discard errno = 0 errors
...
Upstream-commit: 49c62879b8e3df0f0126b8ad844509bb79e016e5
Component: engine
2013-10-16 23:05:50 +00:00
Michael Crosby
4e221a5f03
Merge pull request #2246 from dotcloud/clean_when_start_fail
...
Add cleanup when container.Start fails
Upstream-commit: 34745ee0f4d487fd1eb6c6e1cdac1672deb26658
Component: engine
2013-10-16 15:06:08 -07:00
Victor Vieux
9d55c0e3cd
Merge pull request #2251 from dotcloud/skip_autoremove_test
...
skip auto-remove test for now
Upstream-commit: d21bd5b96493220ed61a62fa9366055a81f41721
Component: engine
2013-10-16 14:59:08 -07:00
Michael Crosby
e2c3019026
Merge pull request #2249 from jpetazzo/cleanup-errclosing-in-proxy
...
Catch errClosing error when TCP and UDP proxies are terminated.
Upstream-commit: 82220ea2add4bc829ea47e63f0d4724a2a59b808
Component: engine
2013-10-16 14:51:43 -07:00
Victor Vieux
9ca3eddef5
skip auto-remove test for now
...
Upstream-commit: 655b16c712f1112949ab0f694a12c4b3c7924498
Component: engine
2013-10-16 21:47:20 +00:00
Jérôme Petazzoni
d7c383fbe1
Catch errClosing error when TCP and UDP proxies are terminated.
...
Upstream-commit: cc851dbb3f4725562729f12663e246690a61c620
Component: engine
2013-10-16 14:43:20 -07:00
Victor Vieux
b5387a5b52
fix panic
...
Upstream-commit: e40fd1e3e10198b9e2291b3383ed041743a73878
Component: engine
2013-10-16 21:39:03 +00:00
Michael Crosby
2c8dcaacd9
Revert "Fix #2115 Clean AUFS references. Also fixes some links to client libraries and mongo example."
...
This reverts commit f4c17a202b5f6021d48c3cb3342c37607b509630.
Upstream-commit: dab84f7e8bc1647f70782731e797fd827c7ce42a
Component: engine
2013-10-16 14:38:24 -07:00
Daniel Mizyrycki
5f90a0b230
testing infrastructure, PR #2195 : Add aggregated docker-ci email report
...
Upstream-commit: a2ffa637ceb694b1e7a21972a9482a0c9c1676c8
Component: engine
2013-10-16 13:30:15 -07:00
Guillaume J. Charmes
cb827ceba2
Refactor container.Start()
...
Upstream-commit: ed6ca109bf27fb2f1855332c47b7375fe4eaa8aa
Component: engine
2013-10-16 13:12:56 -07:00
Victor Vieux
adb94a43dc
Add clean if start fail
...
Upstream-commit: 664acd29718ba367cdbad17ec7ee83d1fe01b7e4
Component: engine
2013-10-16 19:48:24 +00:00
Victor Vieux
9ff0513e0d
change an errorf to a debugf
...
Upstream-commit: 3acfc600285dedd2e10a3780e041af0cc39675a7
Component: engine
2013-10-16 19:45:10 +00:00
Victor Vieux
609dfc2138
remove false alarm error
...
Upstream-commit: 0e64a4d7e7d5dd7c68ecc1df9fe8234938f12026
Component: engine
2013-10-16 19:38:12 +00:00
Victor Vieux
410e5fb77b
api.go:108 Error parsing media type: error: mime: no media type
...
fix
Upstream-commit: 104a86936ab2611d6e8e54f5ef686f2e9d231bcf
Component: engine
2013-10-16 19:32:03 +00:00