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
4,543 Commits 12 Branches 297 Tags
9331f255c063fcb9ff8ef4a387d205a8e00a2e90
Commit Graph

680 Commits

Author SHA1 Message Date
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
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
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
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
Josh Poimboeuf
5763c9619e resize pty after starting 
Since ptyMaster is created during container start (startPty), it should
resized after starting, not before.
Upstream-commit: 171d681724443cf69f669dcaf4887f5d99894b25
Component: engine
 2013-11-20 11:40:30 -06:00
Frederick F. Kautz IV
390195822f Offline Image Transfers #1155 
Upstream-commit: 7eaa59f626fa9e9b3bf61d3d7eff0fb70b3d011a
Component: engine
 2013-11-20 03:52:33 +00:00
Guillaume J. Charmes
b6950e3878 Merge branch 'master' into creack-merge-master 
Conflicts:
	api_params.go
	graph.go
	graph_test.go
	image.go
	integration/api_test.go
	integration/container_test.go
	integration/runtime_test.go
	runtime.go
Upstream-commit: 28d4cbbc59e419f00c1ad75991b106241933ca5d
Component: engine
 2013-11-19 14:58:12 -08:00
Guillaume J. Charmes
6e0c243c2e Lintify code with confidence=1 
Upstream-commit: 5e941f1ca035bb1ec014c18d277aecaa41deba85
Component: engine
 2013-11-18 16:24:11 -08:00
Josh Poimboeuf
4070c845dc don't forward SIGCHLD to container 
It makes no sense to forward SIGCHLD to the container.
Upstream-commit: 440422a96346072a0a9016c4db78ff7599a702aa
Component: engine
 2013-11-18 11:45:29 -06:00
Sven Dowideit
dbd9984b5b add some common examples for docker images, and tell the user what -a filters out 
Upstream-commit: 152459b7272daa30ab5207b512f5319fdc4ff491
Component: engine
 2013-11-16 20:45:30 +10:00
Sven Dowideit
bc3e877db3 expunge the word 'Resource' in reference to a file/dir in a CONTAINER - that way users don't wonder how its different from a Path 
Upstream-commit: 27159ce6bac4308b5fba311258fab8e852667787
Component: engine
 2013-11-16 20:15:04 +10:00
Alexander Larsson
fa730d3073 Print devicemapper status details in docker info 
This adds a generic Status call in the Driver api and
implements if for the devicemapper backend.

The status is an array of key/value strings rather than a map so that
we can guarantee some static order of the docker info output.
Upstream-commit: 243843c0787ce2b56c8bbf72a2d4bd7604e84b2e
Component: engine
 2013-11-15 11:04:02 +01:00
Alexander Larsson
fb91dc2f0c Show active driver in docker info output 
Upstream-commit: 062810caedba973e76a3dd7eb9e45b56511eefc6
Component: engine
 2013-11-15 10:24:48 +01:00
Guillaume J. Charmes
7686e1f389 Merge branch 'master' into shykes-0.6.5-dm-plugin 
Conflicts:
	utils.go
	utils_test.go
Upstream-commit: 7cf60da38880534d76d031c4646fbd469d922385
Component: engine
 2013-11-14 14:02:44 -08:00
Solomon Hykes
6c1679864e Move integration tests to integration/, expose missing public methods in the core 
Upstream-commit: 359a6f49b9ec704686d0cb0df7cb0d7c8d5f55a7
Component: engine
 2013-11-14 10:50:00 -08:00
Victor Vieux
5c6b4b612c Merge pull request #2648 from dotcloud/docker_kill_exit_code 
Make sure docker kill exit with failure in case of error
Upstream-commit: 388057f11a20fd8b4bfd7d1b0d9f0cb18a72afa8
Component: engine
 2013-11-12 14:40:17 -08:00
Guillaume J. Charmes
ce008ff5b0 Fix ImageTree test 
Upstream-commit: 08623dc216227d6377cb4558caedd75cacf68755
Component: engine
 2013-11-12 12:25:35 -08:00
Victor Vieux
b17fc3fb8e Merge pull request #2657 from dotcloud/fix_docker_images_output 
use utils.ParseRepositoryTag instead of strings.split in docker images
Upstream-commit: dcc9980550d46ca43878566f00d5259fce05b1ca
Component: engine
 2013-11-12 11:01:29 -08:00
Victor Vieux
111d9154c1 Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert 
Conflicts:
	server.go
Upstream-commit: b314f19db8f2180292691f20f28783042b80495e
Component: engine
 2013-11-12 10:19:29 -08:00
Michael Crosby
084cb15f1a Allow drivers to implement ApplyDiff in Differ interface 
Upstream-commit: 5d9723002bc764e2c768e5184994d7949f55fc49
Component: engine
 2013-11-11 19:09:57 -08:00
Victor Vieux
b55bba158e add wait, stop, start, restart, rm, rmi 
Upstream-commit: e2ac0e6b806c094fd8a3b706653623c0c2aee861
Component: engine
 2013-11-11 14:47:23 -08:00
Victor Vieux
a30846b548 use utils.ParseRepositoryTag instead of strings.split in docker images 
Upstream-commit: 84a3600ea82d1a3ea235f1193092206c1f0c011a
Component: engine
 2013-11-11 13:54:17 -08:00
Guillaume J. Charmes
a52e1003c4 Make sure docker kill exit with failure in case of error 
Upstream-commit: 8149439d956489a551f9e197ca2adbae85e78ff0
Component: engine
 2013-11-11 09:15:51 -08:00
David Sissitka
5090a5bd4b Make "docker insert" errors obvious 
Closes #1130
See also #1942
Upstream-commit: 5957dd909134fc3c3dc3e165b83559feb89d9f5b
Component: engine
 2013-11-08 00:15:19 -06:00
Guillaume J. Charmes
600bb37cb7 Deprecate old tagging format 
Upstream-commit: ef57752bce5c333d0e2b8352a84d071f21cce132
Component: engine
 2013-11-07 17:30:51 -08:00
Sven Dowideit
d03901e0ad Closes #2328 - allow the user to specify a string timestamp (not just a unix epoch) in the string format that the docker cli shows to the user 
Upstream-commit: 01fea3cf116b768720b542ab65cbd1c2695848d0
Component: engine
 2013-11-08 09:32:13 +10:00
Andy Rothfusz
a16746b24c Merge pull request #1794 from justone/add-images-tree 
add -tree option to images
Upstream-commit: 807a305f36c54d54a20109992f4f301b62ae0081
Component: engine
 2013-11-06 16:12:36 -08:00
Guillaume J. Charmes
d677b4b873 Merge pull request #2334 from SvenDowideit/2149-small-cli-usability-change 
change ID to CONTAINER ID/IMAGE ID
Upstream-commit: 45aba3dc959d867147fedc8e8ac578d2acfb4d79
Component: engine
 2013-11-06 09:45:23 -08:00
Nate Jones
e9a1f4f7ff add image size to -tree 
Upstream-commit: b7d1d35c278c57ad4732dc23e529cf771158ee96
Component: engine
 2013-11-06 04:23:07 +00:00
Nate Jones
2dbd3407de implement "images -tree" 
Upstream-commit: ec9a9a08b8b76079207ced5b55a7caade27fb3d3
Component: engine
 2013-11-06 03:58:16 +00:00
Nate Jones
cbbaa36a2b move "images -viz" to client 
Upstream-commit: 2a5998baf172f94a8d6866e46207a0d7d75e70e5
Component: engine
 2013-11-06 03:58:15 +00:00
Nate Jones
59c6d98498 rework images JSON 
Upstream-commit: 15867ff4308c5c1330a400be56410d404336100f
Component: engine
 2013-11-06 03:58:15 +00:00
Andy Rothfusz
b64b038b00 Merge pull request #2460 from SvenDowideit/2294-use-repo-colon-tag-everywhere 
covert docker (commit|import|tag) to use REPOSITORY[:TAG]
Upstream-commit: 962a66cd36a615bb0a7cb9866becdccf4aa97839
Component: engine
 2013-11-05 10:29:54 -08:00
Victor Vieux
22e1fc60ec Merge pull request #2382 from dotcloud/reflect_future_changes_search_api 
Update docker search to reflect future changes of the api
Upstream-commit: a482bfd715c6c33603ee5fbdc27693c942dbef93
Component: engine
 2013-11-04 16:14:14 -08:00
Victor Vieux
4dd237b1bf remove column size hack 
Upstream-commit: 854cc5f55992b8bb200f470b11896a0b3cb68d4e
Component: engine
 2013-11-04 15:34:51 -08:00
Victor Vieux
39f858c891 Fix logs with tty 
Upstream-commit: 1f44fd8624d1de3f7e1e55880352faef2e141fb1
Component: engine
 2013-11-04 12:19:20 -08:00
Sven Dowideit
d38ad81595 tiny table heading tweak for #2149 - change ID to CONTAINER ID/IMAGE ID or IMAGE (the later if it could be an ID or a repo:tag 
Upstream-commit: b840b73b08a4f491d0eb8b5a05302342b8bc9242
Component: engine
 2013-11-04 22:10:51 +10:00
Sven Dowideit
8c3f937eb2 conert docker (commit|import|tag) to use REPOSITORY[:TAG] (and repove support for REPOSITORY TAG) 
Upstream-commit: 1f3cdc11ee0c7088c8619f8b31bcd17ce8b79b79
Component: engine
 2013-11-04 22:07:55 +10:00
Victor Vieux
698f7cfe59 Merge pull request #2503 from dotcloud/2500-inspect-fix 
Client: Inspect fix
Upstream-commit: fc455351977157e7e833d1a5ad3ce48dbf545501
Component: engine
 2013-11-01 15:24:05 -07:00
Victor Vieux
cbce82a91e Merge pull request #2457 from dotcloud/2454_do_not_split_last_column 
RemoteAPI: Do not split last column docker top
Upstream-commit: 8f27e23b4b28406e7cde47ea74d56232c935208c
Component: engine
 2013-11-01 15:21:47 -07:00
Victor Vieux
47ebac600d rebase and add some filters 
Upstream-commit: 747967b4a4e2bfa429a76d20db77b990d23b1a0f
Component: engine
 2013-10-31 19:25:55 -07:00
Victor Vieux
dfa410640a update docker search to reflect future changes of the api 
Upstream-commit: 02b52024328996e2028d7d953ef6a9c1e2e50744
Component: engine
 2013-10-31 19:14:11 -07:00
Victor Vieux
b0e7dd34da fix inspect error message 
Upstream-commit: a89a98e59432109d99c08b43f670df7429145172
Component: engine
 2013-10-31 18:50:58 -07:00
Victor Vieux
42fe9c53e7 fix inspect when it returns nothing valid 
Upstream-commit: 40ed10cc32fe6dbf18d13a43d42a1a9bed0df902
Component: engine
 2013-10-31 18:39:44 -07:00
Michael Crosby
fb9771da9e Move archive.go to sub package 
Upstream-commit: 96d1e9bb5a269936afeb9748a894f6995b17e0a4
Component: engine
 2013-10-31 16:57:45 -07:00
Victor Vieux
a162db7be1 Merge pull request #2432 from SvenDowideit/doc-stop-kill-details 
IRC: add SIGTERM and SIGKILL details to docker stop and kill docco
Upstream-commit: 4b8a176ee0f5df3d7f29f7995f38c700330468b1
Component: engine
 2013-10-30 18:57:07 -07:00
Travis Cline
67b88fd430 Add flags to history, add size flag 
Upstream-commit: 1099d172a2f083c456c3564d403e666e965a9544
Component: engine
 2013-10-30 19:41:20 -05:00
Victor Vieux
1f8c72b79c do not split last column docker top 
Upstream-commit: fb4672c52c050ce08c7432d2d149e37b0056e8f6
Component: engine
 2013-10-29 19:03:41 -07:00