toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,589 Commits 3 Branches 295 Tags
33479248a5482077a79ba06f1d87f174a7fb18d7
Commit Graph
3589 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jérôme Petazzoni cbeb5bbba7 Fix error/debug messages in Container.Attach and recover from ErrClosedPipe conditions. 
Upstream-commit: fc659b68e4cd4f1a07a9fe37be4ebcb8e030a652
Component: engine
 2013-10-16 11:35:45 -07:00
Guillaume J. Charmes 6ef1db724f Merge pull request #2243 from jpetazzo/comments-stdcopy 
Add better comments to utils/stdcopy.go.
Upstream-commit: 99f6b43f4f757ad177dac2c8139520d7d51b4d99
Component: engine
 2013-10-16 11:17:15 -07:00
Victor Vieux 529ef5824f Merge pull request #2244 from dotcloud/add_cleanup_leftover_container_tests 
Tests: add cleanup to remove leftover containers
Upstream-commit: 2b92aa71f9f25a3e7d9d4bb0081d26e72af7a5f1
Component: engine
 2013-10-16 11:09:48 -07:00
Victor Vieux c27a5b0233 add cleanupin tests to remove leftover containers 
Upstream-commit: f854529ae8c9e0139e9ca0466c597b133e3bf41e
Component: engine
 2013-10-16 18:06:37 +00:00
Jérôme Petazzoni 261563ed6c Add better comments to utils/stdcopy.go. 
Upstream-commit: e32debcf5fb6bf056a871930a8a88d545653e96f
Component: engine
 2013-10-16 10:58:53 -07:00
Andy Rothfusz e0f9b734b2 Merge pull request #2236 from SvenDowideit/2209-comments-doc 
#2209 - add the example @tianon gave to elaborate on the Comment docume...
Upstream-commit: 0e08e1d6959718cca86994b73686811e7d3ba158
Component: engine
 2013-10-16 10:51:15 -07:00
Andy Rothfusz 7d69f30bb3 Merge pull request #2231 from metalivedev/1919-docreleaseinfo 
Fix #1919 document how to edit and release docs.
Upstream-commit: 65b62307c35bfe58ee345de622c1779a01f2d178
Component: engine
 2013-10-16 10:45:01 -07:00
Andy Rothfusz 64a054faa9 Merge pull request #2090 from kencochrane/master 
added initial draft of the Docker infrastructure doc
Upstream-commit: 03e5d94b123a47626fc440fe681981fd03b94cb4
Component: engine
 2013-10-16 10:44:22 -07:00
Tianon Gravi 6de222a908 Merge pull request #2233 from tmc/master 
Add mkimage-arch.sh
Upstream-commit: 0ca533ca356872b29586e4f59b443c667709d7e8
Component: engine
 2013-10-15 19:27:45 -07:00
Travis Cline c5210160da Add mkimage-arch.sh 
Upstream-commit: d94a027da6fc75e856b31246de0b4a49206e942b
Component: engine
 2013-10-16 02:26:15 +00:00
Sven Dowideit 689165f239 #2209 - add the example @tianon gave to elaborate on the Comment documentation 
Upstream-commit: 7250f9487463ae50d73865a4d02caec611e613ad
Component: engine
 2013-10-16 11:12:47 +10:00
Michael Crosby bedabb5a87 Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix 
Abort build if mergeConfig returns an error and fix duplicate error message
Upstream-commit: 4196c704f052687e8b9010f0e407f66417c55d04
Component: engine
 2013-10-15 17:40:48 -07:00
Victor Vieux f5ea2a9958 Merge pull request #2235 from dotcloud/update_dockerfile 
Update Dockerfile test comment
Upstream-commit: adb48ef319e0b15fde3376c96ff69a304836d24d
Component: engine
 2013-10-15 17:32:48 -07:00
Victor Vieux 8846d6c443 Update Dockerfile test comment 
Upstream-commit: ee7d9b0bdec40d02ba5ef25f557cca9444a19669
Component: engine
 2013-10-16 00:31:34 +00:00
Victor Vieux de1101cd9e Merge pull request #2221 from flavio/fix_broken_tests 
Fixed broken tests
Upstream-commit: 2f4526d5c43eeba53f32a37c456cc9d761d95648
Component: engine
 2013-10-15 17:26:19 -07:00
Victor Vieux 0332f84dd7 Merge pull request #2232 from shykes/error-should-be-debug 
Remove error messages which are not actually errors
Upstream-commit: 261285c2c220aab326dcbdf1682560bddea0e496
Component: engine
 2013-10-15 17:12:51 -07:00
Solomon Hykes 8c6c389ec3 Remove error messages which are not actually errors 
Upstream-commit: cbc49d7d76dfc9e259d5227a0077a83e5faf1202
Component: engine
 2013-10-15 23:12:27 +00:00
Solomon Hykes 8bf263047f Merge pull request #2230 from shykes/hack-select-test 
hack: only run certain tests with TESTFLAGS='-run TestName' make.sh
Upstream-commit: 4dc90405e35b406a71c72923e082e86852a080c9
Component: engine
 2013-10-15 15:58:54 -07:00
Solomon Hykes ac2cdb6787 hack: only run certain tests with TESTFLAGS='-run TestName' make.sh 
Upstream-commit: b7abe9dab56f79e410ef2821cbea6344a65b555b
Component: engine
 2013-10-15 22:57:40 +00:00
Andy Rothfusz 6c0068a0fa Fix #1919 document how to edit and release docs. 
Upstream-commit: cd455ca6fa3a899153880a7b95b9d07762b4c97c
Component: engine
 2013-10-15 15:52:21 -07:00
Flavio Castelli 67ef149cd9 Fixed broken tests 
Some tests failed because the `auplink` binary was not found inside of the
"docker" container.
Upstream-commit: ca56b35e5334d9f6a6741830951eb1535ca6f9b2
Component: engine
 2013-10-15 11:44:56 +02:00
Tianon Gravi baeaf54d26 Add vim syntax highlighting for Dockerfiles from @honza 
See https://github.com/honza/dockerfile.vim
See also https://twitter.com/_honza/status/390046317579620352
Upstream-commit: ace059e409f0df056ace0191b02504d051b81d92
Component: engine
 2013-10-15 03:35:13 -06:00
Tianon Gravi 56ffd7de59 Add zsh completion from @felixr with permission 
See https://github.com/felixr/docker-zsh-completion for the original.
See also https://github.com/dotcloud/docker/issues/2202#issuecomment-26313287

Fixes #2202
Upstream-commit: 9da2b3590e52d7f3409d70f183382cee6d6ff81f
Component: engine
 2013-10-15 03:04:06 -06:00
Tianon Gravi 66869bbf80 Move contrib/docker.bash to contrib/completion/bash/docker for better organization 
Upstream-commit: e99ab1df9758bd7bd819e87bf231399ef8f031d6
Component: engine
 2013-10-15 03:02:31 -06:00
Solomon Hykes c2ea620041 Merge pull request #2218 from tianon/ksid 
Remove @KSid from contrib maintainers for now
Upstream-commit: fde157425c48a7d05e2cafb87c1ac0b168f46ee9
Component: engine
 2013-10-15 00:13:58 -07:00