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
Victor Vieux 9e9829e4a7 fix wrong untag while docker rmi 
Upstream-commit: 93810b289c6c8394061da41a59f7fa5c655be0d7
Component: engine
 2013-10-21 17:03:32 -07:00
Justin Force 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
Andy Rothfusz fcf658a6b5 Clean up level 3 headers. 
Upstream-commit: a1fc8e17a79818977375d5e97a1afdc5f2d2fca8
Component: engine
 2013-10-21 14:03:09 -07:00
Ole Reifschneider 4785dd0921 Fix github link in docs 
Upstream-commit: f903feee03d4df4361c79a44b6f5d78d4718b350
Component: engine
 2013-10-21 22:58:56 +02:00
Andy Rothfusz fad393274f Merge pull request #2303 from metalivedev/2302-fixintro 
Fix #2302
Upstream-commit: 26adda6c31d53275444aaf97ac2c15ebd712a11c
Component: engine
 2013-10-21 09:39:34 -07:00
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
Daniel Mizyrycki 8802449935 testing infrastructure, issue #1800: Refactor docker testing using Docker in Docker 
Upstream-commit: 95f3f77fc417bbc55f03e869136deec27e26bc51
Component: engine
 2013-10-18 22:33:16 -07: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
Guillaume J. Charmes f83e69dc32 Merge branch 'master' into dm 
Conflicts:
	Dockerfile
	buildfile.go
	container.go
	hack/make/test
	runtime_test.go
	utils/utils.go
Upstream-commit: e9ee860c91b6e9cdcafc03cff9941affb6341a0d
Component: engine
 2013-10-18 12:38:29 -07:00
Guillaume J. Charmes 439158e160 Switch back some Errorf to Debugf. 
Upstream-commit: c2175ae736e6b77119ec92a832e325ec076a1e78
Component: engine
 2013-10-18 12:29:16 -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
Alexander Larsson e878830be2 devmapper: Fix prefix name to work with udev 
Udev escapes "," used in device names to 0\x2c which breaks libdevmapper.
Instead use : to escape minor and minor which works.
Upstream-commit: 2812baf3957391bf8871bd56c00a58f4fbc0b715
Component: engine
 2013-10-18 11:39:47 +02:00
Alexander Larsson 1357281d03 devmapper: Fix major/minor extraction 
The way devices are mapped is a bit more complex than before.
This implements the method from new_decode_dev in:
https://github.com/mirrors/linux-2.6/blob/master/include/linux/kdev_t.h

Which is what is needed on kernels > 2.6
Upstream-commit: 572b1fd9be69c20a98d885e18b327031ef4f4b51
Component: engine
 2013-10-18 11:38:21 +02:00
Solomon Hykes 5be5b89b7a devmapper: use major,minor of underlying device in devmapper device name, for readability. 
Upstream-commit: 4756ad248a6b8c70a7f4d6cb1aacd6e60e27b1e6
Component: engine
 2013-10-18 08:30:53 +00:00
Solomon Hykes e658fc1a1d devmapper: clearer make the 'unknown base hash' error message more understandable 
Upstream-commit: dfb77274cef85c0561d98de2eee8b2562c329d1f
Component: engine
 2013-10-18 08:22:42 +00: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
Solomon Hykes 89f16d267d Merge remote-tracking branch 'alexlarsson/dm-status' into dm 
Conflicts:
	devmapper/deviceset.go
Upstream-commit: 73545199a8e84ebc7e44bf2595c7f7b0e20f04a1
Component: engine
 2013-10-18 07:17:13 +00:00
Solomon Hykes c588125712 devmapper: cleanup error reporting 
Upstream-commit: 0ad35c67462ce3343b99d40ea78755d2ad92a754
Component: engine
 2013-10-18 07:09:13 +00:00
Solomon Hykes 8069d98b90 Merge branch 'dm' of ssh://github.com/dotcloud/docker into dm 
Upstream-commit: 5e363072f54ec1cf0fdb7feb70cdce38622dcbe0
Component: engine
 2013-10-18 06:51:50 +00:00
Solomon Hykes b73358fb51 devmapper: the tests are fast enough that we no longer need a workaround to avoid timeouts 
Upstream-commit: cad913c57bbd1d9f9b3b2284ee9e2c262734047b
Component: engine
 2013-10-18 06:48:20 +00:00
Solomon Hykes cc3628cab5 hack: encode the name of the current test in temporary directories, for easier tracking 
Upstream-commit: 5f58a1fbe4733c1415046d6e16afd17a41b595a8
Component: engine
 2013-10-18 06:47:08 +00:00
Solomon Hykes e20e669277 Increase readbility of unit tests by using mkRuntime everywhere 
Upstream-commit: 07e09d57af29bf9b59945ab2f31c4dc5ab52bb5b
Component: engine
 2013-10-18 06:44:30 +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
Solomon Hykes c3b863ceed Merge pull request #2269 from alexlarsson/dm-blocksize 
devmapper: Use a smaller blocksize for the thin-pool
Upstream-commit: 9f85a967bb121a5102f2244611a6aa9cf3abb2b3
Component: engine
 2013-10-17 22:50:33 -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
Solomon Hykes 66093eff84 devmapper: rename deviceset_devmapper.go to deviceset.go 
Upstream-commit: 85a36b3b53f39e13bba9d69a486758b68301d503
Component: engine
 2013-10-18 05:19:22 +00: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 19207ea5e6 Merge remote-tracking branch 'alexlarsson/dm-readonly-images' into dm 
Conflicts:
	devmapper/deviceset_devmapper.go
Upstream-commit: d3505d836ac98a95b2129206844b6e4d6ad24927
Component: engine
 2013-10-18 03:40:46 +00:00
Solomon Hykes f6aee57647 Merge remote-tracking branch 'alexlarsson/fix-tar-leak' into dm-correct 
Upstream-commit: c47e93fcbeda6c1c29a95b6d0deb23f5d03a07ed
Component: engine
 2013-10-18 03:32:47 +00:00
Solomon Hykes 4e4f3e50fd hack: fail tests if there are leftover temp files before or after 
Upstream-commit: 5cd7de5de8fddd5868c6b85ed1e4f46228c82672
Component: engine
 2013-10-18 03:31:21 +00: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
Solomon Hykes 1f33220276 devicemapper: Add fixme 
Upstream-commit: d034aafac7a9db601b8affd61a28c762be6b6c31
Component: engine
 2013-10-18 00:58:20 +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