toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,316 Commits 3 Branches 295 Tags
165eb5011405cedd778e345f6f8b1b304b237053
Commit Graph
502 Commits
Author SHA1 Message Date
Arnaud Porterie 3f04cb0ed2 Merge pull request #14051 from mavenugo/services 
experimental services ui
Upstream-commit: fef0e84b2df31ba12fa46984e3564f9daa6f576d
Component: engine
 2015-06-20 18:24:37 -07:00
Sebastiaan van Stijn 36a670da43 Merge pull request #11907 from gcuisinier/11094-allow-import-from-file2 
fix #11094 - Allow 'docker import' to load from local files
Upstream-commit: 67f9bbcbd4d741e22e61b21a411cd904dcd4329c
Component: engine
 2015-06-20 12:17:58 -07:00
Gildas Cuisinier 8b52aa6697 work on #11094 allow import from local file 
Signed-off-by: Gildas Cuisinier <gildas.cuisinier@gcuisinier.net>
Upstream-commit: 3f64b76d4c66127466ce5b2ee0e8827eea7440b3
Component: engine
 2015-06-20 09:04:43 +02:00
Alexander Morozov 3ed8856a88 Merge pull request #13997 from runcom/drop-old-client 
Error out if client API version is too old
Upstream-commit: e5ded9c378f4efdece8ed6e8d166198124956459
Component: engine
 2015-06-19 17:05:39 -07:00
Madhu Venugopal 4d14f9391a attaching services api and UI chain to docker parent 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 742db1737c26b07fb08f46ce7391586aec674dd1
Component: engine
 2015-06-19 09:19:09 -07:00
Madhu Venugopal 4c8d2626b0 register libnetwork API and UI with docker parent chain 
This commit also brings in the ability to specify a default network and its
corresponding driver as daemon flags. This helps in existing clients to
make use of newer networking features provided by libnetwork.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: da5a3e6dee80f1f5d4059851e4762ffb0484f7e9
Component: engine
 2015-06-18 12:07:58 -07:00
Antonio Murdaca f3684edb38 Error out if client API version is too old 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 910322a8935a45b6b69255edd3e06c8fef97feda
Component: engine
 2015-06-18 11:03:07 +02:00
Lei Jitang a2d8dcc9ab Add bridge-nf-call-iptables/bridge-nf-call-ipv6tables to docker info 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 57d12a0e0aca49ddd4baad3d37b77f31d63ff70b
Component: engine
 2015-06-17 09:19:11 +08:00
Josh Hawn 4cf65f9e74 Merge pull request #13869 from jlhawn/multi_line_help_usage 
api/client: Allow for multi-line usage help
Upstream-commit: 86d6a5b11f74e7cc302dc8ccc7ec82119763cb5a
Component: engine
 2015-06-15 14:50:17 -07:00
Arnaud Porterie cd985d0b5e Merge pull request #13860 from jlhawn/cli_call_headers 
api/client: have cli.call() return headers
Upstream-commit: cd36b15ccb8561de95ee2e018baa778316da4423
Component: engine
 2015-06-13 09:14:40 -07:00
Arnaud Porterie 1a52506c99 Merge pull request #13749 from Microsoft/adduseragent 
Add GOOS in User-Agent
Upstream-commit: 422fa7f0a6c27e73125dd1f25de02198033e313e
Component: engine
 2015-06-12 17:19:51 -07:00
Josh Hawn 1f7c141bcf api/client: have cli.call() return headers 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 0cdc3b7539b618778becf233157604698b4e8281
Component: engine
 2015-06-10 16:20:13 -07:00
Josh Hawn 8f5fcaf455 api/client: Allow for multi-line usage help 
Subcommands can provide multiple usage synopses.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 4cb0c93f9287d29934894c871d156801122516cd
Component: engine
 2015-06-10 16:14:45 -07:00
John Howard c49e649bfd Typo fix in api\client\utils.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 84aec1e8e6e6b3e7ea2da31fcae5a80df026edc6
Component: engine
 2015-06-10 15:24:53 -07:00
John Howard 475fb0945f Add GOOS in User-Agent 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 543cf79ffba276fe90ff9eb3a85adb4a53e31366
Component: engine
 2015-06-04 13:37:41 -07:00
Antonio Murdaca 2d31933cd6 Merge pull request #13165 from ahmetalpbalkan/durations 
Allow duration strings as --since/--until
Upstream-commit: f18ce101fbdf6c62a5643f826ed69a8abb843d87
Component: engine
 2015-06-03 22:14:42 +02:00
Qiang Huang 63f811604a Add comment about inspect output 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 01a9a9284fd0082edead2ea6eaa01d152f7f4157
Component: engine
 2015-06-03 17:35:57 +08:00
Ahmet Alp Balkan add0a8eb5b Allow duration strings as --since/--until 
Fixes #13107. This change enables Go duration strings
computed relative to the client machine’s time to be used
as input parameters to `docker events --since/--until`
and `docker logs --since` arguments.

Added unit tests for pkg/timeutils.GetTimestamp as well.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 4e3b21f99e7fb7fac0075be2e7190d5f07c9ee66
Component: engine
 2015-06-02 21:02:47 +00:00
David Calavera 7eb8a02dc4 Merge pull request #13607 from vieux/PrintfIfNotEmpty 
do not print empty values in docker info
Upstream-commit: 814a92c5a1745879156ac9ab18569a9d1bc1b1a9
Component: engine
 2015-06-02 10:52:45 -07:00
Jessie Frazelle 25eb4c5026 Merge pull request #13611 from duglin/Issue13417a 
Allow .dockerignore to ignore everything
Upstream-commit: aa8d8fdc0cfe07ce4e4976dc41a3fdb86ebcfc66
Component: engine
 2015-06-01 15:59:57 -07:00
Victor Vieux a8436a9c51 no not print empty keys in docker info 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: c790aa36ea92799593fe4b32fc516784eb0c2c43
Component: engine
 2015-06-01 15:05:20 -07:00
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
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
Doug Davis 1d47fe7076 Allow .dockerignore to ignore everything 
Change CLI error msg because it was too specific and didn't make sense
when there were errors not related to inaccessible files.

Removed some log.Error() calls since they're not really errors we should
log. Returning the error will be enough.

Closes: #13417

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 82ea6ed2bc33ac1ec2ad2bd8d4a098031dd77095
Component: engine
 2015-05-30 04:16:00 -07: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
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
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
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
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
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
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
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
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
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
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
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
Tibor Vass 71c213ec0b Merge pull request #13131 from Microsoft/10662-loadonwindows 
Windows: Build load.go
Upstream-commit: 3985f1781228d6060228d83e559f14e6d7cc9d7c
Component: engine
 2015-05-12 18:04:33 -07:00
Doug Davis 2e83148ffd Use stderr instead of logrus for CLI error messages 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0024935f641ab596732f9162d3eab795bbc2ae06
Component: engine
 2015-05-12 17:22:41 -07:00
Antonio Murdaca aeecef0f70 Refactor pkg/stremformatter with custom constructors instead of passing a boolean 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6b700bdacae0b416d8239a0a24729fe327d425d1
Component: engine
 2015-05-13 00:09:41 +02:00
John Howard aaf186c8e8 Windows: Build load.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: aed8f9f76e16ed7acc49fbdef5f4563834ac5167
Component: engine
 2015-05-12 14:26:57 -07:00
Michael Crosby de6eaa3d3d Merge pull request #13136 from Microsoft/10662-factoroutresolveconf 
Windows: Don't pull in all of resolvconf
Upstream-commit: cb53a628b0b722cac24586bd3bef578a5a8e6ed8
Component: engine
 2015-05-12 13:49:47 -07:00