starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-01 02:24:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,830 Commits 14 Branches 321 Tags
abbb76e2901ac7a3aa877da31ddfc94ce2001cc6
Commit Graph
725 Commits
Author SHA1 Message Date
Victor Vieux 349763ab43 Merge pull request #2998 from creack/fix_json_display 
Fix json display
Upstream-commit: 8afb0abbee0ff135a5314d7078285378b8f49c93
Component: engine
 2013-12-02 12:58:58 -08:00
Victor Vieux 1528c85fe3 Merge pull request #2965 from crosbymichael/no-private-port 
Only return published ports for docker port
Upstream-commit: 62f0e5aef9726761cde5bc73abdf7c318102203e
Component: engine
 2013-12-02 12:18:47 -08:00
Guillaume J. Charmes 134dbf8c6a Fix displayJson behavior (dont add newline) 
Upstream-commit: 6ea3b9651b3793e31a320926472ff23383a7b915
Component: engine
 2013-12-02 11:47:13 -08:00
Dustin Sallings c86bbee38a Add -format to 'docker inspect' 
This makes it a lot easier to script with docker instances as one can
ask for details about running instances more easily without having to
have additional JSON processing tools installed.

dotcloud/docker#734
Upstream-commit: 9837ad8e9b96b118e8d004e773a05ff9dd208b48
Component: engine
 2013-12-02 11:07:41 -08:00
Victor Vieux 128e1b30b4 Merge pull request #2728 from SvenDowideit/docker-import-doc 
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
Upstream-commit: 4b35c1b6a6167a0dce11cd748c94598199dce942
Component: engine
 2013-12-02 10:59:15 -08:00
Michael Crosby 26b3fb6752 Merge pull request #2829 from dotcloud/refactor_opts 
Refactor opts
Upstream-commit: fe571dd29328efe5f5318c0b146d0aa5a66217a2
Component: engine
 2013-12-02 10:41:30 -08:00
Michael Crosby 92e4ac1dc3 Merge pull request #2945 from dotcloud/refactor_stream 
Refactor stream
Upstream-commit: e1414a4c3999362c97ad66ed1dd9cd64678df9af
Component: engine
 2013-12-02 10:31:09 -08:00
Guillaume J. Charmes f91ba66458 Merge pull request #2984 from SvenDowideit/2319-build-check-for-dockerfile 
check on the client side that there is a Dockerfile
Upstream-commit: 5f2313aad396a7cf5750fd5c13236bc5b81b8026
Component: engine
 2013-12-02 09:35:31 -08:00
Johannes 'fish' Ziemke 85e4b81e0c Make docker build return exit code of build step 
If a command during build fails, `docker build` now returns with
the exit code of that command.

This makes it necessary to change the build api endpoint to
return a json object stream.
Upstream-commit: b04c6466cdc89a107879af7a22b0917006b38730
Component: engine
 2013-12-02 17:52:37 +01:00
Sven Dowideit 66b887f55d check on the client side that there is a Dockerfile, so we don't upload a huge stack of files, only to realise we can't do anything 
Upstream-commit: 26cf8b9aff1cffa7c3e3ae7e720c960ff545ee78
Component: engine
 2013-12-02 15:55:08 +10:00
Guillaume J. Charmes 2c50a80ad5 Merge pull request #2926 from crosbymichael/attach-wait 
Return process exit code for attach
Upstream-commit: 62b1faf28c25a678a50f59251cccd2316239cc4a
Component: engine
 2013-11-29 18:49:24 -08:00
Michael Crosby 5658618c30 Only return published ports for docker port 
Upstream-commit: 65db62619c8ae61c9735cb2a433adac7731256a5
Component: engine
 2013-11-29 16:45:20 -08:00
Guillaume J. Charmes a0f64049ec Merge branch 'master' into fix_tests 
Upstream-commit: bb284ce59d661d9ec6e8dc9fd5b8fe21b588484b
Component: engine
 2013-11-29 13:17:36 -08:00
Guillaume J. Charmes 27de84e1e0 Make sure the termcaps are restored after hijack 
Upstream-commit: c13821ad0bfa596a8bbc06a494500ee39a35e429
Component: engine
 2013-11-29 09:55:15 -08:00
Guillaume J. Charmes 4a151bb6e6 Actually test the detach (was not the case before) 
Upstream-commit: 63d6cbe3e4d6f29c2491b0f1f505ef79b7191d8e
Component: engine
 2013-11-29 09:11:20 -08:00
Sven Dowideit 98a6754c91 re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file 
Upstream-commit: ba5268d382dec7b731717feec77b6e7d2e6cfdaf
Component: engine
 2013-11-29 11:22:17 +10:00
Victor Vieux a63f83c19a Merge pull request #2881 from yrashk/patch-1 
Fix command line help for docker save
Upstream-commit: 677e2ad92ef526918e5054b5afe1fbd858219fa3
Component: engine
 2013-11-28 16:42:40 -08:00
Michael Crosby 36cc89d71d Return process exit code for attach 
Fixes #2240
Upstream-commit: 1fe1b216ad9b60f6b25a5dadda5fe26c3602b054
Component: engine
 2013-11-28 15:25:50 -08:00
Victor Vieux ee50ddf929 split in 3 files 
Upstream-commit: 597e0e69b4c8521f39691d0a07d1f31b7116a337
Component: engine
 2013-11-28 12:16:57 -08:00
Guillaume J. Charmes f70d58d92d Make volumes opts more strict 
Upstream-commit: c7661f40b6c6a23e5fe2090a94bd9fa6521242d7
Component: engine
 2013-11-26 23:00:44 +00:00
Guillaume J. Charmes f211a9a21d Refactor Opts 
Upstream-commit: 1ba11384bf82f824b0efbab31aaca439cfba1b4f
Component: engine
 2013-11-26 17:46:06 +00:00
Yurii Rashkovskii c7a4b3b1ae Fix command line help for docker save 
`docker save IMAGE DESTINATION` is not what `docker save` expects
Upstream-commit: 82674372946b431f93add255e137f82822eecfc1
Component: engine
 2013-11-26 06:54:46 -08:00
Victor Vieux 3a30422210 fix -link parsing 
Upstream-commit: 009024ad6439fad28ab3a9d8db6b6844bfbba8c9
Component: engine
 2013-11-26 00:05:46 -08:00
Victor Vieux 8d3710fbe5 fix docker run on an unknown image 
Upstream-commit: 0bb2c0b1d0f651e23c949381762fe79a45c58aeb
Component: engine
 2013-11-25 23:20:36 -08:00
Guillaume J. Charmes 020e2aed63 Merge branch 'master' into use_utc_time 
Conflicts:
	image.go
Upstream-commit: 19df6c32c03a649795415bcdf2fd062715557be1
Component: engine
 2013-11-25 19:01:13 -08:00
Solomon Hykes acc5196685 Merge pull request #2609 from shykes/0.6.5-dm-plugin 
Move aufs to a storage driver, add devicemapper and dummy drivers
Upstream-commit: 1d903da6fd89b0322f76bc91c07fd3dbe4d22099
Component: engine
 2013-11-25 18:58:26 -08:00
Solomon Hykes 542c84c74e Merge branch 'master' into 0.6.5-dm-plugin 
Upstream-commit: 43c7df946d56a9d9d0e0b7226042a0dd6a58a17b
Component: engine
 2013-11-26 02:00:25 +00:00
Sven DowideitandSven Dowideit 7ee06b046b add 'to STDOUT' to the help, and add a simple eg that mentions it too 
Upstream-commit: 9696ec509a53afaaf9b761b00f60e517634f7e4e
Component: engine
 2013-11-23 12:28:50 +10:00
Guillaume J. Charmes 63cc3164f1 Remove useless New*Opt functions, singleline Opt types 
Upstream-commit: c67f9b671df024d06b0af0a0eaa02058e69ee9f5
Component: engine
 2013-11-22 14:42:30 -08:00
Guillaume J. Charmes ce1c3dbb0a Make a validation on links name 
Upstream-commit: 1c8ae47770b423b9c2f1125bd25cef0482a4600d
Component: engine
 2013-11-22 14:33:25 -08:00
Guillaume J. Charmes d6ea186ed7 Remove goroutine leak. Make sure termcap are reset each time. 
Upstream-commit: d55998be81973be5b083eed56b223c8ce98ce073
Component: engine
 2013-11-22 14:09:37 -08:00
Michael Crosby 627f045fff Merge branch 'master' into 0.6.5-dm-plugin 
Upstream-commit: e69bbd239ee8dc4bdc0963810448d9f34e4c30c4
Component: engine
 2013-11-22 14:06:59 -08:00
Guillaume J. Charmes 6e7d75df95 Format CmdRun 
Upstream-commit: 076c0eab704e5c4819611a42b1551f1d759fb376
Component: engine
 2013-11-22 12:14:34 -08:00
Guillaume J. Charmes 4a4a051d8a Use a constant for PortSpecTemplate + display the template in the CmdRun help 
Upstream-commit: 1f9223a7c2c0e5c04936c56a071830f8792c3dd7
Component: engine
 2013-11-22 12:00:34 -08:00
Guillaume J. Charmes c04337f42e Reformatting parseRun and partParse 
Upstream-commit: 476559458d49b6d4eacfdbe9025ddf69947ae2b7
Component: engine
 2013-11-22 11:58:02 -08:00
Michael Crosby d8bc0d9deb Merge pull request #2823 from dotcloud/2817-run_rm-fix 
Fix docker run -rm
Upstream-commit: ae8c589d35e9cd7148d98a0471d0c5c9c77e3908
Component: engine
 2013-11-22 11:35:29 -08:00
Victor Vieux f1afbc9e5f fix -rm 
Upstream-commit: 1e7c04fcfe0b1dbc93a8d70e7bf94e963aa764d8
Component: engine
 2013-11-22 11:23:48 -08:00
Mark Allen 65390c08ce Pass terminal setting to display utils 
Upstream-commit: 8b0cd60019b33488f8819da5c7bdd28d1d3fc737
Component: engine
 2013-11-22 00:05:55 -06:00
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
Guillaume J. Charmes eec0335af0 Use UTC for time 
Upstream-commit: 806abe90ba38741707f58e98ecdcdd4bc19f52e2
Component: engine
 2013-11-21 16:43:36 -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
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
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
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