docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
5,871 Commits 12 Branches 297 Tags
efeecbbbfbefb3285c1903ade7ff702ca858d73e
Commit Graph

5871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianon Gravi
002ca069aa Merge pull request #2263 from tianon/hack-release 
Update hack/release.sh process to automatically invoke hack/make.sh and bail on building/testing issues
Upstream-commit: f0dbdba5c00f988da893627fe7b9d54b95bc7157
Component: engine
 2013-10-23 15:31:16 -07:00
Tianon Gravi
cea1ec67ae Fix install.sh with $sh_c to get sudo/su for modprobe 
Upstream-commit: 0324e567ad60d66358075bf866299abeae5241b3
Component: engine
 2013-10-23 15:48:30 -06:00
Tianon Gravi
bab3ffd21b Merge pull request #2226 from tianon/init 
Add initial init scripts library and better/safer Ubuntu packaging that works for Debian, too
Upstream-commit: ef5cf6c1ec88c71465075f272e58150ae26d25fa
Component: engine
 2013-10-23 14:29:41 -07:00
Tianon Gravi
6a3e04b0eb Merge pull request #2306 from tianon/fix-ubuntu-install-aufs 
Update hack/install.sh with some more Ubuntu-specific installation stuff...
Upstream-commit: afaddd04f77b1296ed42a2753d43e59d43d8cc35
Component: engine
 2013-10-23 14:22:55 -07:00
Tianon Gravi
24baeed431 Update all the mkimage scripts to use --numeric-owner as a tar argument to properly preserve ownership 
Upstream-commit: 8e43db95f2299f9b63ab3d1728e73f2a5f6600b3
Component: engine
 2013-10-23 14:08:16 -06:00
Victor Vieux
40ad755eae Merge pull request #2327 from dotcloud/2325_fix_untag_rmi 
fix wrong untag while docker rmi
Upstream-commit: 7a116220e79b7ef8116c4726dced2a25ecc0873c
Component: engine
 2013-10-23 10:24:20 -07:00
Victor Vieux
6c2f704b07 Merge pull request #2349 from shykes/runtime-cleanup 
Runtime: remove unused field kernelVersion
Upstream-commit: 894a68d2ee957d75d599bf8e704ffa717212cf0f
Component: engine
 2013-10-23 09:54:00 -07:00
Tianon Gravi
72bb301695 Merge pull request #2353 from wrouesnel/mkimage-debootstrap-improvements 
mkimage-debootstrap.sh: Add -p option to invoke debootstrap with http_proxy
Upstream-commit: dc57d4ca26cf53551b849e308369e60238478479
Component: engine
 2013-10-23 09:26:45 -07:00
Will Rouesnel
47b8397b61 mkimage-debootstrap.sh: Add -p option to invoke debootstrap with http_proxy. 
This patch allows debootstrap to be run with the http_proxy environment
variable. This is principally useful when you're using apt-cacher and
apt-cacher-ng locally.
Upstream-commit: bc8a1081b047f6ee4ebf0adb22695fe3c98425c6
Component: engine
 2013-10-24 03:21:10 +11:00
Greg Thornton
ce1466ed6d Typo in host integration docs 
Upstream-commit: 33ccd29ae7b6e9c8e5b463c7066426f825c74d0a
Component: engine
 2013-10-23 10:19:12 -05:00
Tianon Gravi
a5e651dbd2 Update hack/make/ubuntu to make less ubuntu-centric packages, to fix the issue of deleting the docker group on every upgrade, to use the new init library scripts for upstart and sysvinit, and to include the dependency on iptables 
Upstream-commit: 2aaaf9032052af472aaf2eaa1a5b934c9bfeb0a8
Component: engine
 2013-10-23 07:38:12 -06:00
Yang Bai
4cbb2084bc refactor utils.ParseHost with switch-case, so we can add other proto support easily 
Upstream-commit: 99f16755661de79cac1ccda78e3e96552f6a4491
Component: engine
 2013-10-23 18:29:35 +08:00
Solomon Hykes
0d8e2ee2ed Runtime: remove unused field kernelVersion 
Upstream-commit: 7e4d00840392a80c0946291848c4caa18a5ec108
Component: engine
 2013-10-23 00:44:57 -06:00
Victor Vieux
1050f660ec Merge pull request #2279 from dotcloud/fix_docker_inspect 
Client: improve docker inspect
Upstream-commit: b0515a7016d9be58e989401f65645af756d904ef
Component: engine
 2013-10-22 17:17:35 -07:00
Victor Vieux
5c37701dc5 Merge pull request #2341 from dotcloud/1327-race_build_verbose-fix 
fix race condition in docker build with verbose + cleanup hostIntegration debug
Upstream-commit: 8ff7b70c91387a0e868371b2b4055f57a26a057e
Component: engine
 2013-10-22 16:46:36 -07:00
Victor Vieux
5658c0e9c4 fix status code 
Upstream-commit: 01284cbf7350d1b4537e83ddd60274afccf32ecf
Component: engine
 2013-10-22 15:39:51 -07:00
Victor Vieux
d8ab9dfa35 fix race condition in docker build with verbose + cleanup hostIntegration debug 
Upstream-commit: 10e10c9573a0f20243212192fa782feb35651b18
Component: engine
 2013-10-22 15:01:06 -07:00
Michael Crosby
976a5606b2 Merge pull request #2338 from proppy/patch-1 
Registry: Fix content-type for PushImageJSONIndex
Upstream-commit: b73065ab338c660743299cc7b170447e7165795c
Component: engine
 2013-10-22 14:48:12 -07:00
Johan Euphrosine
92782b4f08 registry: fix content-type for PushImageJSONIndex 
Upstream-commit: d93023daa9db2b6d38f7eefc8611e8226d75bbaf
Component: engine
 2013-10-22 11:56:48 -07:00
Andy Rothfusz
185088440f Merge pull request #2261 from edmund-wagner/master 
make copy paste user friendly
Upstream-commit: 81866087fe6260eccfd9490f990ad01fec911b15
Component: engine
 2013-10-22 11:31:49 -07:00
Michael Crosby
e3e02821f6 Merge pull request #2150 from pnasrat/fix-mnt-subdir-volumes 
Fixes issues with mounting subdirectories of /mnt in container.
Upstream-commit: e70030a0c347b2fe8a8ea7b92fab3dde6b928f3b
Component: engine
 2013-10-22 11:26:50 -07:00
Victor Vieux
e702af3a56 Merge pull request #2330 from alexlarsson/dm-fix-change-detection 
Fix typo that made change detection break
Upstream-commit: 1fe08e004686b25aaf56bc01194629c0b7e658f9
Component: engine
 2013-10-22 10:20:53 -07:00
Andy Rothfusz
f2236c43dc Merge pull request #2318 from Tranquility/master 
Fix github link in docs
Upstream-commit: 3bd45824da739d98745193e68c15e85edbbb7b60
Component: engine
 2013-10-22 09:55:33 -07:00
Victor Vieux
86b2904f93 Merge pull request #2198 from hamo/hamo/chdir_error 
check return value of syscall.Chdir when changing working directory
Upstream-commit: 13c913d883a8d26f18de4a833786a5bb305d3d94
Component: engine
 2013-10-22 09:54:25 -07:00
Alexander Larsson
91978e1533 Fix typo that made change detection break 
We were comparing the old and old mtimes rather than the old and
the new. This meant we missed some file changes where only the mtime
changed.
Upstream-commit: bc1c5ddf2ebbb74dd2e2bc2d4a7a24c75edf6877
Component: engine
 2013-10-22 11:13:24 +02:00
Tianon Gravi
01e56b8651 Merge pull request #2326 from justinforce/commentstring 
Set commentstring in Vim syntax plugin
Upstream-commit: 92beaed06601a799ef927ab7222415e25e684415
Component: engine
 2013-10-22 00:41:34 -07:00
Victor Vieux
b0bd7be583 Merge pull request #2307 from gurjeet/sorted_commands_in_help 
Place 'top' subcommand's help in proper order.
Upstream-commit: 6b04913e730b6ae11c7ec6a63820b41d429071a9
Component: engine
 2013-10-21 18:07:39 -07:00
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