p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
16,877 Commits 2 Branches 295 Tags
0236ca4bfe792c708ff1e76112aacc2263008fa0
Commit Graph

530 Commits

Author SHA1 Message Date
Morgan Bauer
66d10b96a0 golint for cliconfig 
- fully capitalize HTTP in HTTPHeaders
 - comment for CONFIGFILE
 - camelcase and privatize oldConfigfile, defaultIndexserver
 - remove unused var errConfigFileMissing
 - comments for methods and functions throughout
 - external references to renamed variables changed

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: dea49b7474f0efcefe4618b6133330f0bb5e2c84
Component: engine
 2015-07-20 16:48:58 -07:00
Sebastiaan van Stijn
c4955551ce Merge pull request #11485 from wlan0/rollover_log 
Add rollover log driver, and --log-driver-opts flag
Upstream-commit: 415f744d0c5980d332ab54c80f1521a0e5b4d401
Component: engine
 2015-07-17 22:41:26 +02:00
Derek McGowan
1492d5ce64 Update graph to use vendored distribution client for the v2 codepath 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 19515a7ad859b28c474d81e756ac245afcd968e3
Component: engine
 2015-07-16 13:13:47 -04:00
Victor Vieux
22fa301a78 add support for base path in docker cli -H 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 47a7f770f42bc0fd9b0a594b72a8f20fb4b874d1
Component: engine
 2015-07-08 15:42:40 -07:00
Patrick Hemmer
2aff354ec5 add --format flag to docker version 
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
Upstream-commit: 41588a57662456f1a27c48921c680ac2a6e079c3
Component: engine
 2015-07-13 19:10:56 -04:00
Jessie Frazelle
0602984ad2 Merge pull request #14518 from Microsoft/10662-infowarnings 
Windows: Remove meaningless warnings on docker info
Upstream-commit: 41858096592cdb13893ce9e618997856d615b016
Component: engine
 2015-07-13 14:30:57 -07:00
Jessie Frazelle
6b5ea18f12 Merge pull request #13986 from tg123/master 
prompt a cli login if receive 401 from registry v2 auth server
Upstream-commit: ff8cef332663584504c24a1e4968069b1fcdc29c
Component: engine
 2015-07-10 15:33:42 -07:00
Phil Estes
576b45a55d Merge pull request #13554 from Microsoft/10662-winexec 
Windows: The real Windows exec driver is here.
Upstream-commit: b7e8169274ba4b897601e1025b91ebd361902213
Component: engine
 2015-07-10 17:13:10 -04:00
John Howard
c3450bd95b Windows: Exec driver 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9ae9d4c87af8b04eb80006aca9f760ffdb1052bb
Component: engine
 2015-07-10 13:36:56 -07:00
Doug Davis
3e1377983b Add support for DOCKER_CONFIG/--config to specific config file dir 
Carry #11675

Aside from what #11675 says, to me a key usecase for this is to support
more than one Docker cli running at the same time but each may have its
own set of config files.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: daced1d30345aca06857f874dfb48b7e90cb409b
Component: engine
 2015-07-10 12:51:34 -07:00
John Howard
c8344b3dc3 Windows: Remove meaningless warnings on docker info 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 615681f5177cef974d516d5814195c768e773dd2
Component: engine
 2015-07-10 10:06:20 -07:00
Ma Shimiao
03b04678dd api/client: unify format of args check 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 9a4cbb358d7b839611b86856c73683e0499d681d
Component: engine
 2015-07-08 17:29:47 +08:00
Ma Shimiao
a462e56268 api/client: close the returned io.ReadCloser 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 91a496055c3e45ab3fba8e643475adb618581e1f
Component: engine
 2015-07-08 10:06:25 +08:00
Ma Shimiao
ed646be3f9 client/load: tiny typo fix 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 87cfc2bc58628eb432e326439c1fceeff03704b8
Component: engine
 2015-07-03 08:37:27 +08:00
wlan0
fb988a52e9 add support for maximum log size, and max number of log files 
Signed-off-by: wlan0 <sidharthamn@gmail.com>
Upstream-commit: 9b782d3af322bd8d9cf857d63eb7f2e0fe484c90
Component: engine
 2015-07-02 06:26:06 -07:00
Ma Shimiao
23dd86bcae Unify docker commands' usage in man and help 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: f38232b475d126d6ea3a37d82be2c7269324e4ab
Component: engine
 2015-07-02 10:33:26 +08:00
Shishir Mahajan
8aaef3e5b3 Flag Addition: --type flag added for docker inspect command 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 2cb74e691538351efbdee7a78be6535f22c5d024
Component: engine
 2015-07-01 12:14:01 -04:00
Alexander Morozov
7f4872fe6c Merge pull request #14297 from pwaller/move-nat-pkg 
Move /nat to /pkg/nat
Upstream-commit: caa4acc7b11cbefb74d0b066d4a0752f4a11c5ee
Component: engine
 2015-06-30 13:23:30 -07:00
Brian Goff
335520845a Merge pull request #13524 from calavera/plugin_json_spec 
Plugins JSON spec.
Upstream-commit: f13b40f6e7678753f3414a75a6b0d175bc4d1d3f
Component: engine
 2015-06-30 15:44:48 -04:00
Peter Waller
9161e24479 Move /nat to /pkg/nat 
By convention /pkg is safe to use from outside the docker tree, for example
if you're building a docker orchestrator.

/nat currently doesn't have any dependencies outside of /pkg, so it seems
reasonable to move it there.

This rename was performed with:

```
gomvpkg -vcs_mv_cmd="git mv {{.Src}} {{.Dst}}" \
	-from github.com/docker/docker/nat \
        -to   github.com/docker/docker/pkg/nat

```

Signed-off-by: Peter Waller <p@pwaller.net>
Upstream-commit: 9c2374d19623581028f070bc93fa4c60a660dce4
Component: engine
 2015-06-30 17:43:17 +01:00
David Calavera
7b3bea6e05 Plugins JSON spec. 
Allow full configuration of external plugins via a JSON document.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 333ac3a3eb09c29c42fe2cea1680621700b67b2f
Component: engine
 2015-06-29 10:32:18 -07:00
Phil Estes
2107a3b6a8 Add better client error for client certificate failure (missing or denied) 
This adds a more meaningful error on the client side so the "bad
certificate" error coming from the TLS dial code has some context for
the user.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: d175ef6773708afef5982d233ad600f18cf2cdc2
Component: engine
 2015-06-26 16:23:05 -07:00
John Howard
1e47c22f14 Windows: Security warning based on server OS 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 126529c6d0a20675de8f50939c57f23259d3e763
Component: engine
 2015-06-26 10:33:45 -07:00
Damien Nozay
d924a293ae Update utils.go 
make error message when running commands while daemon is down more user-friendly.

```
docker@54.175.201.239 ~: sudo service docker stop
docker stop/waiting
docker@54.175.201.239 ~: docker images
Get http:///var/run/docker.sock/v1.19/images/json: dial unix /var/run/docker.sock: no such file or directory. Are you trying to connect to a TLS-enabled daemon without TLS?
```

Signed-off-by: Damien Nozay <damien.nozay@gmail.com>
Upstream-commit: e9ac7d24a7de5e009f74887cf21f15b6bb4e4605
Component: engine
 2015-06-25 10:15:52 -07:00
Vincent Batts
e5b3b3d23c Merge pull request #14047 from Microsoft/10662-versionadd 
Add build time to version and tidy output
Upstream-commit: 5c93c265f69198509d405862127ad9b11be2e269
Component: engine
 2015-06-23 09:57:31 -07:00
John Howard
888e384d70 Add branch and build time to version 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 87eae0d659d6e4bb75942455f3f73a74f54ed3b9
Component: engine
 2015-06-22 13:00:27 -07:00
Sujith Haridasan
8939422a27 Display when a container is in --net=host in docker ps 
Display */tcp, */udp when a container is in --net=host in docker ps

Signed-off-by: Sujith Haridasan <sujith.h@gmail.com>
Upstream-commit: 8a9ed097469ad64a3ed593a77505f605f284cfb6
Component: engine
 2015-06-22 11:44:33 +05:30
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
tgic
b1c6279d52 prompt a cli login if receive 401 from registry v2 auth server 
Signed-off-by: tgic <farmer1992@gmail.com>
Upstream-commit: fe7b3658bd828bc034037d9ae813b4addf7dfdc3
Component: engine
 2015-06-17 19:28:13 +08: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