docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Code Activity
4,584 Commits 12 Branches 297 Tags
cf914fd88c7579bb0e79cde498b9c5fc83170dd4
Commit Graph

4247 Commits

Author SHA1 Message Date
Michael Crosby
cf914fd88c Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	image.go
Upstream-commit: 0cecc2a78c246a5b809954059650a4c22442e0d6
Component: engine
 2013-11-21 17:18:41 -08:00
Michael Crosby
6ea3214afa Merge pull request #62 from shykes/devmapper-unit-tests 
Devmapper unit tests
Upstream-commit: 437bdeee5901daa9d73db393767b1c5030c15143
Component: engine
 2013-11-21 16:54:50 -08:00
Michael Crosby
b82d2b8801 Merge pull request #2798 from dotcloud/fix_state_race 
Refactor State to be 100% thread safe
Upstream-commit: 25e443a3c7f55d5ccfb1f5a96c427bd50b978f4d
Component: engine
 2013-11-21 16:39:50 -08:00
Guillaume J. Charmes
915356af08 Refactor State to be 100% thread safe 
Upstream-commit: 33e70864a2c4321bf6968d6d521c159a1b72b220
Component: engine
 2013-11-21 16:34:58 -08:00
Guillaume J. Charmes
26fbc2e027 Forbid syscalls in tests, add 2 new unit tests 
Upstream-commit: bc82940a575944e4686db203356a8a3fb3a75217
Component: engine
 2013-11-21 16:32:16 -08:00
Michael Crosby
0e00966e8f Merge pull request #2678 from cxmcc/minor 
Minor code simplification for Containers api
Upstream-commit: d6e6214d37499977110e05d5d01cbf25dcae878f
Component: engine
 2013-11-21 16:27:15 -08:00
Michael Crosby
8c720af218 Merge pull request #2488 from viirya/fix_container_volumes_delete 
Skip the volumes mounted when deleting the volumes of container.
Upstream-commit: 70f1bd31041f9207ae06be5fe2680152eb154047
Component: engine
 2013-11-21 16:20:22 -08:00
Michael Crosby
b7afbe130d Merge pull request #2304 from unclejack/fix_layer_size_computation 
Fix layer size computation: handle hard links correctly
Upstream-commit: f7c2a00557a304af753e487d87ef5ed9b6266e27
Component: engine
 2013-11-21 16:10:24 -08:00
Victor Vieux
4718170d22 Merge pull request #2731 from SvenDowideit/docker-commit-doc 
make the docker commit help more copy&pasteable
Upstream-commit: 8498b44eac24f4f62cd082aa9ecac7ce503bb3ef
Component: engine
 2013-11-21 15:33:05 -08:00
Andy Rothfusz
de93f1b190 Merge pull request #2772 from bitoiu/patch-3 
Change to documentation for AWS AMI request
Upstream-commit: e2dcfc2cf7ea00619e327a900d1b87cb437a634c
Component: engine
 2013-11-21 15:15:04 -08:00
Andy Rothfusz
1eafcb9d5e Merge pull request #2717 from metalivedev/2342-uploadingcontext 
Fix #2342. Harmonize information about ADD. Cross-link build info.
Upstream-commit: 9b4c15114201bab21437853463d58652c8e1624a
Component: engine
 2013-11-21 15:09:47 -08:00
Andy Rothfusz
96fa8485ac Merge pull request #2799 from rosenhouse/patch-1 
Fix title on doc page for remote_api_client_libraries.rst
Upstream-commit: 50239e057309f4efdb6f9ed39d988a8316601103
Component: engine
 2013-11-21 14:40:33 -08:00
Guillaume J. Charmes
e859413830 Merge pull request #2763 from dotcloud/use_full_id_delete 
Do ont truncate ID on docker rmi
Upstream-commit: 42c23b0f048b417bd233bef3f57e529102ae1177
Component: engine
 2013-11-21 14:39:38 -08:00
Paul Morie
f8ba7a65e3 Fix typo in pullImage 
Upstream-commit: 3f17844b6ec3edb981653ca237d085909d5be671
Component: engine
 2013-11-21 17:29:03 -05:00
Guillaume J. Charmes
68f143de04 Merge pull request #2794 from dotcloud/fix_status_code_and_usage 
fix status code and usage
Upstream-commit: bcdeb37bb64eca25bee9b1736a53f8ef4684c9a0
Component: engine
 2013-11-21 13:48:38 -08:00
Gabe Rosenhouse
63c337d326 Fix title on doc page for remote_api_client_libraries.rst 
Upstream-commit: 362e9d6b3c7049d44c016ee72fe255b76ec80c5a
Component: engine
 2013-11-21 12:45:01 -08:00
Michael Crosby
9dfa0ceb9c Revert "Lock state before we modify." 
This reverts commit d7e2fc898284fe29ed43f7b28eae56e7e052e854.
Upstream-commit: cb70eedfdad40538983f9610322262ce84e284a0
Component: engine
 2013-11-21 12:11:25 -08:00
Victor Vieux
06096928cc Return status exit status 2 on usage, move parserun into commands.go, display usage on stderr 
Upstream-commit: 75a7f4d90cde0295bcfb7213004abce8d4779b75
Component: engine
 2013-11-21 11:43:07 -08:00
Victor Vieux
9331f255c0 Merge pull request #63 from tianon/flag-help-consistency 
Update a few flag help strings for consistency and clarity
Upstream-commit: da824b4a5a1acd3409ff46f1795180f3303e99a8
Component: engine
 2013-11-21 11:31:34 -08:00
Tianon Gravi
cdba895115 Update a few flag help strings for consistency and clarity 
Upstream-commit: 1ab6b8bf4970b050575b008dd658471e185f2a2c
Component: engine
 2013-11-21 12:30:17 -07:00
Victor Vieux
ef47b4e273 Merge pull request #2795 from pnasrat/docker-testmultipleattachrestart-race 
Lock state before we modify.
Upstream-commit: eaeb969138205349c08e485c0bc4d29dbe2567d7
Component: engine
 2013-11-21 11:28:02 -08:00
Michael Crosby
a3c4139aad Update ImageExport after merge fail 
Upstream-commit: 253214f07da1a58931e6a256c351105eb2eee8bc
Component: engine
 2013-11-21 10:26:21 -08:00
Michael Crosby
ebbbc781a4 Merge branch 'master' into 0.6.5-dm-plugin 
Upstream-commit: a2c9d2da93e5106b82e8f3951947a90508a8f430
Component: engine
 2013-11-21 10:21:30 -08:00
Paul Nasrat
7a482f2a8c Lock state before we modify. 
When we start a container we lock state, we should do the same in stop.

Detected via -race.
Upstream-commit: d7e2fc898284fe29ed43f7b28eae56e7e052e854
Component: engine
 2013-11-21 08:06:02 -05:00
Victor Vieux
3152efa2ba Merge pull request #2793 from crosbymichael/offline-ids 
Allow images to be saved and loaded by id and repository
Upstream-commit: f20c738963cb54884037e54a62743398eebfc0c2
Component: engine
 2013-11-21 02:44:00 -08:00
Solomon Hykes
50d7661c9b Devmapper: test driver initialization and its interaction with libdevmapper 
Upstream-commit: df258f5861794057c303a33c000bf830bc543631
Component: engine
 2013-11-21 02:17:03 +00:00
Solomon Hykes
fe06edbbd1 Devmapper: wrap calls to os/exec for easier mocking 
Upstream-commit: 60f728b170f550262b22b7905dfb280a405df4a7
Component: engine
 2013-11-21 02:16:26 +00:00
Solomon Hykes
840cf279cf devmapper: skip test which are not unit tests 
Upstream-commit: 2b7c63b1b5d62515cd876f189dea6e5a5257cd49
Component: engine
 2013-11-21 02:12:51 +00:00
Michael Crosby
10c7f84432 Allow images to be saved and loaded by id and repository 
Upstream-commit: fd7ab143bf1ecfbf20df90edd876f73dc28c264d
Component: engine
 2013-11-20 17:28:19 -08:00
Andy Rothfusz
94ec1bcdfe Merge pull request #2727 from SvenDowideit/docker-images-doc 
add some common examples for docker images, and tell the user what -a filters out
Upstream-commit: 82cdd21a3492789a47fc4c3bb3f8a4d85b89d14c
Component: engine
 2013-11-20 16:30:48 -08:00
Michael Crosby
ead56a419b Merge pull request #57 from shykes/wait_on_pull_already 
Wait on pull already in progress
Upstream-commit: a9230af52e819add5055aa0336e225f77dc62d2a
Component: engine
 2013-11-20 15:58:51 -08:00
Victor Vieux
ad45902f80 Merge pull request #59 from crosbymichael/fix-image-save-size 
Fix image save size
Upstream-commit: 2f0d18ac4a344826167d0e0217ba9963a7841b03
Component: engine
 2013-11-20 15:58:31 -08:00
Michael Crosby
2cabd3e833 Add more aufs tests and implement Status 
Upstream-commit: 5306053e21cb2a22884d2d281c2cc855cf22fc69
Component: engine
 2013-11-20 15:41:37 -08:00
Solomon Hykes
91acb2bfd6 Devmapper: mock all calls to libdevmapper in the unit tests, and deny them by default 
Upstream-commit: e2390318bb4cc98886777bdad3fbb860942b8e65
Component: engine
 2013-11-20 23:39:02 +00:00
Michael Crosby
6fbdd28642 Ensure that only the layers are compressed and not mnt points 
Upstream-commit: 4e0c76b321cf42d36cdbedcf84103f4fcc123ecd
Component: engine
 2013-11-20 15:37:26 -08:00
Solomon Hykes
f3353c818b Devmapper: remove deprecated test helpers 
Upstream-commit: da514223d1e441e2bab82bf3b30e1a1e0e222ac6
Component: engine
 2013-11-20 23:25:27 +00:00
Solomon Hykes
d1d0a44d0f devmapper: fix typo 
Upstream-commit: 023ff36704ef5ad8d6fc8d0c07f718fec2ec5ff0
Component: engine
 2013-11-20 23:12:19 +00:00
Michael Crosby
f3c5785b7c Fix image size calc on initial save 
Upstream-commit: 8fdbf46afbcad9e4eab79b2804261b084267b6e4
Component: engine
 2013-11-20 14:51:04 -08:00
Guillaume J. Charmes
099a15779c Add devmapper struct doc 
Upstream-commit: d233894c25e2b1b7124d69bddece94c88fb44452
Component: engine
 2013-11-20 14:09:46 -08:00
Victor Vieux
02fde26286 wait on pull already in progress 
Upstream-commit: 8a756f417ee4925bad6c8526fabda05ab8a6c041
Component: engine
 2013-11-20 14:04:19 -08:00
Guillaume J. Charmes
3bd981cb53 Remove os from devmapper 
Upstream-commit: a39bd656622c7dbea534fe34710ed6cb21dd5a90
Component: engine
 2013-11-20 13:05:17 -08:00
Guillaume J. Charmes
8380e89daf Remove all syscall calls from devicemapper 
Upstream-commit: 5690139785fc2bfaa2f233ed41d5f927a8b28dbf
Component: engine
 2013-11-20 12:49:01 -08:00
Solomon Hykes
495a0f953c Mock calls to system functions to facilitate unit testing 
Upstream-commit: 92f94f06ae2fb4cddace5b817d6a6e326f3c9b33
Component: engine
 2013-11-20 20:05:10 +00:00
Michael Crosby
afc3ae3564 Merge pull request #2723 from SvenDowideit/doc-build-image 
Use the work Path for docker cp CONTAINER:PATH
Upstream-commit: 2bc35287a080cd9a9805e343595055dcbfb0db01
Component: engine
 2013-11-20 11:10:13 -08:00
Michael Crosby
cdb93a78ac Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	server.go
Upstream-commit: 2382a0f920f7473b2b2762d886470a417a5dbac7
Component: engine
 2013-11-20 11:07:42 -08:00
Guillaume J. Charmes
03bb8581c6 Merge pull request #51 from crosbymichael/driver-specific-image 
Handle image metadata when drivers are switched
Upstream-commit: 579a5c843bb813bd2080939172de88abe544851a
Component: engine
 2013-11-20 10:45:51 -08:00
Guillaume J. Charmes
c17e4279fa Merge pull request #2773 from dotcloud/speed_up_docker_ps 
speedup docker ps
Upstream-commit: b4f7078a021489395bae4e43a33d457719d30ccc
Component: engine
 2013-11-20 10:40:03 -08:00
Guillaume J. Charmes
88d0c27664 Merge pull request #2760 from dotcloud/improve_engine_test 
improve tests on the engine
Upstream-commit: 9e68913397f6fa6aa495480d72b56b5e071ef40b
Component: engine
 2013-11-20 10:38:46 -08:00
Michael Crosby
f6524ff456 Handle image metadata when drivers are switched 
Upstream-commit: 1b28cdc7f977f265d0d8de53e8ec1d773ed54db1
Component: engine
 2013-11-20 10:31:51 -08:00
Victor Vieux
eeb01414c6 Merge pull request #2747 from jpoimboe/test-fixes 
Test fixes
Upstream-commit: 304a80fcd5ed6d3a73db6b7e73ab5e5ac5e9462d
Component: engine
 2013-11-20 10:07:40 -08:00