p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
15,920 Commits 2 Branches 295 Tags
c5eb072fd3900ea37df30cfde4e518e6d5909d23
Commit Graph

885 Commits

Author SHA1 Message Date
Brian Goff
c86ef1ca0b Merge pull request #13320 from coolljt0725/add_stats_no_stream_show_cpu_usage 
Add docker stats --no-stream show cpu usage
Upstream-commit: a7005c44b5ddfd44c2a54c6d60af52e3fecfaf72
Component: engine
 2015-06-01 09:40:04 -07:00
Phil Estes
c1e042a6e9 Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental 
fix release script for experimental
Upstream-commit: d37aad170ffe75eeaaea07d52863a6159417e5d6
Component: engine
 2015-06-01 12:29:45 -04:00
Lei Jitang
adc8e86b26 Add docker stats --no-stream show cpu usage 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 96123a1fd5c2779ccd7dd722a1fa4196e91dd716
Component: engine
 2015-05-31 01:25:51 +08:00
David Calavera
4f53f1bb13 Merge pull request #13425 from runcom/13421-stats-default-stream 
Fix regression in stats API endpoint
Upstream-commit: 4389fc8bf975a5df567c8431dda82d19a09733a3
Component: engine
 2015-05-29 15:05:21 -07:00
Antonio Murdaca
9b9477d660 Merge pull request #13567 from draghuram/apiver 
Make the version mismatch message more explicit.
Upstream-commit: d79654d0f67c88ceb6b6c2747a2402d248ecea45
Component: engine
 2015-05-29 23:39:48 +02:00
Antonio Murdaca
2b62e414ad Fix regression in stats API endpoint where stream query param default is true 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: ec97f414657189f2ce95d6b5bda26aa9d206b705
Component: engine
 2015-05-29 22:38:36 +02:00
Jessica Frazelle
a4e456d439 fix experimental version and release script 
add api version experimental

Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: b372f9f224d2dcc2a7beca55751782060dc9b12f
Component: engine
 2015-05-29 10:00:22 -07:00
Jessica Frazelle
16f1d90a66 bump api version to 1.20 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: e76d0f55717e08eff68604a52f0b2f1d7c27809c
Component: engine
 2015-05-28 15:32:05 -07:00
Raghuram Devarakonda
9a122de919 Make the version mismatch message more explicit. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: 7b6f9da52c961da18e2a91c4fcb8f124880244d8
Component: engine
 2015-05-28 17:54:48 -04:00
Jessie Frazelle
5c975d5605 Merge pull request #13559 from LK4D4/fix_systemd_listen 
Treat systemd listeners as all other
Upstream-commit: 1f22676fcb2c6f2bd1a1cbf6123587c4d4e917d0
Component: engine
 2015-05-28 14:15:34 -07:00
Alexander Morozov
147b33c180 Treat systemd listeners as all other 
Fix #13549

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6f9fa64645cd67eb10a9c8bd903df518d572f50d
Component: engine
 2015-05-28 12:15:03 -07:00
David Calavera
9749c4b6ff Merge pull request #13428 from duglin/niceHelp2 
Nice help2
Upstream-commit: 617a0c2fde69f2954c2d8959e23e1459636f753e
Component: engine
 2015-05-28 11:09:02 -07:00
Brian Goff
abc263e355 Merge pull request #13259 from Microsoft/10662-configbridge 
Windows: factor out bridgeConfig from server+config
Upstream-commit: 45488f9dc0e2ad5087776445e2069a9ea2c8bf80
Component: engine
 2015-05-28 12:59:57 -04:00
Brian Goff
5e9b1d1a70 Merge pull request #13269 from Microsoft/10662-statsrefactor 
Windows: refactor stats
Upstream-commit: 27919bab2d538961ecdcd06a095d1e9d310621c5
Component: engine
 2015-05-28 12:46:34 -04:00
Alexander Morozov
773a1624ef Merge pull request #13507 from hqhq/hq_remove_redundant_set_header 
Remove redundant set header
Upstream-commit: 7b57fae04668cc4841f0d31f8ce16ac8d044b446
Component: engine
 2015-05-27 10:44:57 -07:00
Qiang Huang
a7e8383688 Remove redundant set header 
Which is already done in writeJSON.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 94d604357ff9cf7a5fcc4d98ffe58f804adf0ae6
Component: engine
 2015-05-27 18:25:57 +08:00
Qiang Huang
d3998344e0 Return err if we got err on parseForm 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 7c7aebfcfef46337aa4e20f9d024916f71650545
Component: engine
 2015-05-27 18:16:28 +08:00
Antonio Murdaca
722bcfc109 Fix race in stats cli and native driver 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 77280a87b70d3b2b629cd30ea93464287f346fa1
Component: engine
 2015-05-26 13:55:02 +02:00
John Howard
08d07187fd Windows: factor out bridge server+config 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ead2f80073623cb53ade435811b155fe69f2774e
Component: engine
 2015-05-23 19:22:06 -07:00
Arnaud Porterie
0d8ca6abd9 Merge pull request #13161 from calavera/plugin_discovery 
Proposal: Volume refactor and external volume plugins
Upstream-commit: bce3e761c0a78ca55cefa9c6d040c1bc9138c1fb
Component: engine
 2015-05-23 18:44:18 -07:00
Doug Davis
743c9dbd95 Carry #11858 
Continues 11858 by:
- Making sure the exit code is always zero when we ask for help
- Making sure the exit code isn't zero when we print help on error cases
- Making sure both short and long usage go to the same stream (stdout vs stderr)
- Making sure all docker commands support --help
- Test that all cmds send --help to stdout, exit code 0, show full usage, no blank lines at end
- Test that all cmds (that support it) show short usage on bad arg to stderr, no blank line at end
- Test that all cmds complain about a bad option, no blank line at end
- Test that docker (w/o subcmd) does the same stuff mentioned above properly

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8324d7918b9c84c5f6508064801534dfd2155c90
Component: engine
 2015-05-23 09:14:18 -07:00
Alexander Morozov
79dd7c9a98 Merge pull request #13372 from calavera/move_socket_creation_to_package 
Extract sockets initialization to a package.
Upstream-commit: d71ba0cc832d3e94aab21e50e3ef7a710874ab79
Component: engine
 2015-05-22 08:46:31 -07:00
David Calavera
89782c55eb Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 81fa9feb0cdc0773eff99d7393c16271e84aac08
Component: engine
 2015-05-21 20:34:17 -07:00
Arnaud Porterie
b53e996e55 Add suffix to experimental builds version 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 78578125ce6c534253d8d60c242d6993c569449e
Component: engine
 2015-05-21 16:27:42 -07:00
David Calavera
7811ce8b6f Extract sockets initialization to a package. 
Because I just used it somewhere else and it would be nice if I didn't have to copy and paste the code.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0bfbc6e78823fc2f455b01a02721f17bcbcaecff
Component: engine
 2015-05-20 16:48:39 -07:00
Jessie Frazelle
0a8a3b1dc5 Merge pull request #13338 from icecrime/13023_experimental_env_var 
Add DOCKER_EXPERIMENTAL environment variable
Upstream-commit: 19790c46dc7fbd489bbd4ccd6f138663312e7579
Component: engine
 2015-05-20 13:04:28 -07:00
Arnaud Porterie
045dd55a7d Add DOCKER_EXPERIMENTAL environment variable 
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ca6722f1c5e4e2017a71e33579d91ac0d9ea2a25
Component: engine
 2015-05-20 12:21:17 -07:00
Alexander Morozov
baf6ea6d24 Merge pull request #13324 from duglin/BadRCOnVersion 
Make version check return 400 instead of 404
Upstream-commit: 53a795378ddb092fc6da8c05ff442f5ed52b7bdb
Component: engine
 2015-05-20 11:13:56 -07:00
John Howard
f113302483 Windows: refactor stats 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 48f1cb4ebeede63294909d0b359c2263a26b2e2f
Component: engine
 2015-05-20 09:08:45 -07:00
Jana Radhakrishnan
6f37ffc9e3 Removed dead code from docker after libnetwork integration 
As part of this some generic packages like iptables, etchosts and resolvconf
have also been moved to libnetwork. Even though they can still be
consumed in a generic fashion they will reside and be maintained
from within the libnetwork project.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: f12f51b8b934c21621c17590f1d526377a297a0d
Component: engine
 2015-05-19 22:40:55 +00:00
Jana Radhakrishnan
13426de5e6 Docker integration with libnetwork 
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
    - Reworked daemon to allocate network resources using libnetwork.
    - Reworked remove link code to also update network resources in libnetwork.
    - Adjusted the exec driver command population to reflect libnetwork design.
    - Adjusted the exec driver create command steps.
    - Updated a few test cases to reflect the change in design.
    - Removed the dns setup code from docker as resolv.conf is entirely managed
      in libnetwork.
    - Integrated with lxc exec driver.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: d18919e304c240df84502cdcc5ed655d92d12d4f
Component: engine
 2015-05-19 22:40:19 +00:00
Doug Davis
bca5faa4ca Make version check return 400 instead of 404 
Closes: #13321

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 7fcf849749322b3e02ae0305f40e505e83b54e9a
Component: engine
 2015-05-19 11:21:05 -07:00
Zhang Wei
6da53b0de7 clean some redundant else clauses 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: d91ae65280c789307ec67fff7e2d268afe3aeba7
Component: engine
 2015-05-19 10:54:04 +08:00
Jason Shepherd
843afe9ea1 adding nicer help when missing arguments (#11858) 
Signed-off-by: Jason Shepherd <jason@jasonshepherd.net>
Upstream-commit: 48231d623fb08eff9da589d6690b10a464df4ec5
Component: engine
 2015-05-19 12:02:13 +10:00
Brian Goff
7113b757dc Merge pull request #13277 from runcom/restartpolicy-methods 
RestartPolicy methods instead of strings checking
Upstream-commit: 3b69ca5b97a937c904b8af91210af86de58f6893
Component: engine
 2015-05-18 14:36:54 -04:00
Brian Goff
3c170ee3af Merge pull request #13271 from Microsoft/10662-nounixsocket 
Windows: No unix_socket.go
Upstream-commit: 692b7b911ede20eda92bf8b0b9cdd81b901de1fd
Component: engine
 2015-05-16 21:34:15 -04:00
Alexander Morozov
c8d066f882 Merge pull request #13237 from ahmetalpbalkan/tag/event 
Introduce daemon event 'tag' upon image tagging
Upstream-commit: b5e932a3bf1e9ba2682f0c3df2cc8fdf51f60229
Component: engine
 2015-05-16 09:05:03 -07:00
Antonio Murdaca
0dbe0e42c5 Add RestartPolicy methods instead of using strings checking 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 624bf81fdb980638c422d746bfb82623e9d8bbd1
Component: engine
 2015-05-16 14:15:28 +02:00
John Howard
5e2fb0c11a Windows: No unix_socket.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6c187b8b4b5110ff416e09e34a2a73304d01044d
Component: engine
 2015-05-15 15:49:02 -07:00
Ahmet Alp Balkan
540e90ab62 Introduce daemon event 'tag' upon image tagging 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 1630ed97acc7bc3a08b57ce5acaa3d8e37a24694
Component: engine
 2015-05-15 20:21:59 +00:00
Victor Vieux
56ea157723 Revert "Fix inconsistent date formats in API" 
This reverts commit 945fc9d882324ac87505e34bb74e6ebe30be1309.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: b261ce5fb007371892bc40a5853337db09a1c8ae
Component: engine
 2015-05-14 17:31:45 -07:00
Brian Goff
59274bcf1f Merge pull request #13202 from duglin/ImportFix 
Fix a regression in `docker import` on error from URL
Upstream-commit: ac81cd1fc36c57b0275992f5e6586728c41dc068
Component: engine
 2015-05-14 10:36:50 -04:00
Doug Davis
cf085c0892 Merge pull request #13208 from ahmetalpbalkan/nit 
Remove out of date comment
Upstream-commit: 1c5a4728e1dec9f154d558e949218e728d464c4e
Component: engine
 2015-05-14 06:59:21 -07:00
Doug Davis
703705b500 Fix a regression in docker import on error from URL 
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake.  This removes the ":" from "... err := " which fixes it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3f4926e49b5f6df00ca09328e990729e00cb1a92
Component: engine
 2015-05-14 06:56:52 -07:00
Ahmet Alp Balkan
b916b32974 Remove out of date comment 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 9448d3627bd655873c3c2e3db38f62d8c54d8349
Component: engine
 2015-05-14 07:37:31 +00:00
Sebastiaan van Stijn
34f1d71bf5 Merge pull request #11706 from HuKeping/time 
Fix inconsistent date formats in API
Upstream-commit: 1d57642906ced778e826f655aed5a0eaab30fe71
Component: engine
 2015-05-13 20:23:19 -07:00
Hu Keping
2e9a18b752 Fix inconsistent date formats in API 
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history

display the Created Time as UNIX format which doesn't make sense.

These should be more readable as CLI command `docker inspect` shows.

Due to the case that an older client with a newer version daemon, we
need the version check for now.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 945fc9d882324ac87505e34bb74e6ebe30be1309
Component: engine
 2015-05-14 18:58:55 +08:00
David Calavera
076e804d9c Merge pull request #12226 from ahmetalpbalkan/logdrivers/refactoring 
daemon: Logging drivers architectural refactoring
Upstream-commit: 951c2ef2c94b10ed49f18ca38353c6507c5231fa
Component: engine
 2015-05-13 11:00:50 -07:00
Antonio Murdaca
af27a9480d Merge pull request #13106 from duglin/HumanizeCliErrors 
Use stderr instead of logrus for CLI error messages
Upstream-commit: 56847ec4d4c24535bd8f4763e895f609eec9e8cf
Component: engine
 2015-05-13 05:23:56 +02:00
Jessie Frazelle
d58b604612 Merge pull request #11965 from duglin/DEBUG 
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
Upstream-commit: 36d995a291c672205d1e8f93f19fb07de253c3d7
Component: engine
 2015-05-12 18:24:04 -07:00