Commit Graph
3869 Commits
Author SHA1 Message Date
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
Tianon Gravi d1f6497ecd Merge pull request #1 from jpetazzo/cherry-on-top-of-hack-release
Cherry on top of hack release
Upstream-commit: ac5bc867718b3ea8da1cb13831592094f3d21076
Component: engine
2013-10-17 23:21:41 -07: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
Tianon Gravi 54f8255e5f Merge pull request #2283 from tmc/master
Make mkimage-arch.sh a little more clear
Upstream-commit: 89a2c8e2cd2ddfe6f7874a1c7f063fdda208c580
Component: engine
2013-10-17 23:05:01 -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
Peter Braden 71320cc1e8 Re #2137 Note about vagrant dns in the test documentation
Upstream-commit: 3db381bf086215ff9d29cf55cb55d7fa086f990d
Component: engine
2013-10-17 13:38:39 -07:00
Victor Vieux 1e82bca350 Update CHANGELOG.md
Upstream-commit: f248a8e13cbde9498a79a902c3d326bf2021e181
Component: engine
2013-10-17 11:27:44 -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 33479248a5 Merge pull request #2255 from dotcloud/bump_0.6.4
Bump to 0.6.4
Upstream-commit: 2f74b1c84bb892641643faf05615a80d555ad066
Component: engine
2013-10-16 17:59:45 -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 8f90ec3513 Merge branch 'master' into bump_0.6.4
Upstream-commit: f16e60665bbd62964a0bd216c4d118a28477a3c3
Component: engine
2013-10-16 17:48:17 -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
Guillaume J. Charmes e2b23f2153 Merge pull request #2256 from dotcloud/discard_errno_0_errors
- Runtime: discard errno = 0 errors
Upstream-commit: 6ee2964a4ff1a6acd6023ff17ece3482ad4848be
Component: engine
2013-10-16 16:22:03 -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
Michael Crosby 0b9a8910b7 Merge pull request #2250 from dotcloud/revert-07-doc-changes
Revert "Fix #2115 Clean AUFS references. Also fixes some links to client...
Upstream-commit: eb2d0d4bf5e7ac43e790784ee81fadfed18b99fc
Component: engine
2013-10-16 14:44:53 -07: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 27d84cc681 Merge pull request #2195 from mzdaniel/report
Add aggregated docker-ci email report
Upstream-commit: 7df8ec2093729b460c88656cb8d3fa6118f0dc58
Component: engine
2013-10-16 14:29: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 aa1116ff4c Merge pull request #2247 from dotcloud/improve_tests_error_messages
Tests: Remove a few errors
Upstream-commit: 6e48b739557d7a474fbdb867cd795717c221b248
Component: engine
2013-10-16 12:50:15 -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
Victor Vieux 593a4ad4b2 use httpError in a separate test
Upstream-commit: df697b4318f533556a2e9351d5995b2d1991ae5a
Component: engine
2013-10-16 19:23:47 +00:00
Tianon Gravi 5169a82f2f Merge pull request #2219 from tianon/completion
Reorganize contributed completion scripts to add zsh completion
Upstream-commit: 27fc01271ec3b9f86da415c024d96d79bc23e2fd
Component: engine
2013-10-16 11:40:56 -07:00
Tianon Gravi b798342998 Merge pull request #2220 from tianon/vim
Add vim syntax highlighting for Dockerfiles from @honza
Upstream-commit: 97ab118fbb13c9a9c700a51d58e099f4df3bea05
Component: engine
2013-10-16 11:40:42 -07:00