toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,543 Commits 3 Branches 295 Tags
9331f255c063fcb9ff8ef4a387d205a8e00a2e90
Commit Graph
4543 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Solomon Hykes 9c9b801114 Hack: don't run integration tests in /var/lib/docker/unit-tests; add missing cleanups in a few tests 
Upstream-commit: 1da335f784882292fb55b25bf255ec5f45072ea4
Component: engine
 2013-10-16 20:10:20 +00: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 05176434d1 WIP: debugging dm-base-hash + dm-refactor-init 
Upstream-commit: cd61fb2e6f9d2a7bbd3c4db2ab9091674746126d
Component: engine
 2013-10-15 23:56:04 +00:00
Solomon Hykes 58a19a7d93 Merge branch 'dm-refactor-init' into dm 
Conflicts:
	runtime_test.go
Upstream-commit: fdba1aeed8c80b3c2f8cd14c3b393581e7ef99a8
Component: engine
 2013-10-15 23:27:28 +00: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 990549480d Merge branch 'dm-base-hash' into dm 
Upstream-commit: c9f3e54c3148aeaaa668bcdff184e14d016d2613
Component: engine
 2013-10-15 23:09:26 +00:00
Solomon Hykes 560c0ccd10 hack: don't set DEBUG when running tests 
Upstream-commit: 3997b8a923c3e95c14237657f0e2c9301fc5f66d
Component: engine
 2013-10-15 23:07:26 +00:00
Solomon Hykes 242fae9ab3 hack: only run certain tests with TESTFLAGS='-run TestName' make.sh 
Upstream-commit: ec885d91806595add47c793e1e6bb8a4b9e8d100
Component: engine
 2013-10-15 23:06:41 +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
Solomon Hykes 9549f4f9e3 Merge branch 'dm-missing-mapper' into dm 
Upstream-commit: 54b0cd7cd1cbea8ca35716bd1b4a20a1900029f4
Component: engine
 2013-10-15 22:51:20 +00:00
Solomon Hykes 80b9a304af Merge branch 'dm-fix-test-2' into dm 
Upstream-commit: 66db2ac9d8176a847936afbad901e97249c27f37
Component: engine
 2013-10-15 22:42:49 +00:00
Alexander Larsson 3dc4429624 devmapper: create device nodes 'on create' instead of 'on resume' 
Upstream-commit: 5ebaca7e55e006083e6e9c2782e4f8b421275579
Component: engine
 2013-10-15 21:27:47 +00:00
Solomon Hykes b68cf98632 Merge pull request #2227 from dotcloud/dm-rename-loopback 
Rename loopback dir to devicemapper
Upstream-commit: 432ff7e3c3be315b475c59310c1d3889f361f744
Component: engine
 2013-10-15 12:23:43 -07:00
Michael Crosby 246243d186 Add filesystemtype for containers 
If no type is specified then assume aufs.
Upstream-commit: 80bd64245f14d4d8a6fc8349cff8b441d770da42
Component: engine
 2013-10-15 11:49:13 -07:00
Michael Crosby 821d8910fe Rename loopback dir to devicemapper 
Upstream-commit: 4431e9edb7cf49ec7da8201da1221b5b03ea09ee
Component: engine
 2013-10-15 11:30:06 -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 ef800becac Refactor mkimage-debootstrap.sh to be much more full-featured 
This includes the following:
- options to control certain parameters
- an option specifically for creating tarballs directly, esp. for dockerbrew
- the addition of the updates and security repositories for Debian images
- the addition of the universe, updates, and security repositories for Ubuntu images
- more correct tagging of Debian images
- tagging of Ubuntu image versions (12.04, 12.10, etc) and latest tag for LTS
Upstream-commit: 095aab9d975a149c33729a0b4981d5b2649167d2
Component: engine
 2013-10-15 03:44:03 -06: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
Tianon Gravi 6d8f5d1b1a Rename mkimage-debian.sh to mkimage-debootstrap.sh to more clearly reflect its true function 
Upstream-commit: 4967f9f19ca9ead375f7d0b3252f543082806c36
Component: engine
 2013-10-15 02:26:10 -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
Tianon Gravi 4181aa5aa7 Remove @KSid from contrib maintainers for now 
His availability has been very limited, so I'll take over completely for the short term until he can find more time to help out.
Upstream-commit: a0e5657cb6c795ddc7c124a9dadd10bac26a5ed3
Component: engine
 2013-10-15 00:58:34 -06:00