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

958 Commits

Author SHA1 Message Date
Doug Davis
f17280b05c Merge pull request #14344 from Mashimiao/add-json-check-for-execcreate 
api/server: Add missing json check
Upstream-commit: 26a35dd09b4faf39a99ff224f5cd4e14ae368585
Component: engine
 2015-07-05 19:04:12 -04:00
Ma Shimiao
08ad652976 api/server: Add missing json check 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 801a7fed19643b7b89929daf53b37e0630e05586
Component: engine
 2015-07-03 08:52:32 +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
David Calavera
7e46cb813f Merge pull request #14359 from cpuguy83/14354_events_send_resp_immediately 
Send resp immediately on GET /events
Upstream-commit: 71f8ca30ce7420b17151405638151bf9661a8134
Component: engine
 2015-07-02 12:00:45 -07:00
Brian Goff
fb7c276639 Send resp immediately on GET /events 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d0a299c027fc6b075bed4992329f93e618186a83
Component: engine
 2015-07-02 11:45:24 -04: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
Sebastiaan van Stijn
8211ecfd09 Merge pull request #13187 from shishir-a412ed/docker_inspect_issue 
Flag Addition: --type flag added for docker inspect command
Upstream-commit: 98f988f62ceccf7237cbcb45f1095ff15f005ea9
Component: engine
 2015-07-02 01:31:15 +02:00
Antonio Murdaca
5607e48f25 Fix regression in containers attach/wsattach api, return not found before hijacking 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 88d32a6109a15633481f758c4d0689516ae58aef
Component: engine
 2015-07-01 18:16:17 +02: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
a8c9aef74e Merge pull request #14061 from runcom/clean-builder-daemon-config 
Add struct to configure Builder commit
Upstream-commit: d543a01e17ace181261dd7809bbeec0c6580b867
Component: engine
 2015-06-29 11:04:05 -07: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
Alexander Morozov
117120a297 Merge pull request #14162 from dnozay/patch-1 
more friendly message for when docker daemon is not running.
Upstream-commit: f46ac8c51c1c481a43f4e503a397f65bc2ae1425
Component: engine
 2015-06-26 09:27:21 -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
Josh Hawn
aa8bc7e1e7 [api, builder] Fix build auth config 
With the 1.7 release, we introduced a change to how we store registry
credentials, but the build API endpoint did not expect a change in the format
of that file. This patch fixes this problem so that you can again pull private
images during `docker build`.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 02c7bbefb8841e5e86a4b9d467defa668e3ea613
Component: engine
 2015-06-23 12:58:17 -07:00
David Calavera
587b3d159c Merge pull request #13966 from mountkin/fix-stats-goroutine-leak 
fix the goroutine leak in the stats API if the container is not running
Upstream-commit: aa4f495caee6ba66ce33a8ef4db0d4067c17195b
Component: engine
 2015-06-23 10:06:35 -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
Shijiang Wei
eb72177bf2 fix the goroutine leak in the stats API if the container is not running 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 1cbf5a54dae86e34d8e65508c5640b17cda0eed8
Component: engine
 2015-06-23 19:38:15 +08: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
Antonio Murdaca
681944f56f Add struct to configure Builder commit instead of using one defined in daemon 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 7046651b87c0c028d010881abbb05a8f0c28ddfa
Component: engine
 2015-06-20 12:53:47 +02: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
Antonio Murdaca
619b47f09a Remove missed code path for api < 1.12 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: b6a6c56915b836cf9579e3148c7d0b4f72722f06
Component: engine
 2015-06-17 17:00:48 +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
Vincent Batts
8810db85be Merge pull request #13198 from rhvgoyal/extend-docker-inspect 
docker-inspect: Extend docker inspect to export image metadata related to graph driver
Upstream-commit: e69df2589c1220217054abdc6a361b55990b3c0b
Component: engine
 2015-06-16 15:03:14 -05:00
Tibor Vass
fa9ff55406 Update vendored go.net to use golang.org/x/net canonical path 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: d820e00aac2376d4e01721557b9af5e482ec89cd
Component: engine
 2015-06-16 11:40:04 -04: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
Vivek Goyal
4a6f8e2e63 docker-inspect: Extend docker inspect to export image/container metadata related to graph driver 
Export image/container metadata stored in graph driver. Right now 3 fields
DeviceId, DeviceSize and DeviceName are being exported from devicemapper.
Other graph drivers can export fields as they see fit.

This data can be used to mount the thin device outside of docker and tools
can look into image/container and do some kind of inspection.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 407a626be62996cd6385ea4d80e669ab83f5f04d
Component: engine
 2015-06-15 14:05:10 -04: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
John Howard
7f7a52e645 Windows: Patch up compile after adjustCpuShares 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d2c5fcc8d5ada5e2f33562ca9f7a9b05d0b01676
Component: engine
 2015-06-12 13:00:59 -07:00
Antonio Murdaca
5210044242 Merge pull request #13911 from cpuguy83/13910_fix_stats_nostream_resp 
Fixes content-type/length for stats stream=false
Upstream-commit: 27e2837c6cd2c0d9b9ff9a0fda943a15b7162798
Component: engine
 2015-06-12 19:53:18 +02:00
Brian Goff
73dfc7d473 Fixes content-type/length for stats stream=false 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 855a056af7829504ccc310587445c61d62427b51
Component: engine
 2015-06-12 13:06:06 -04:00
Darren Shepherd
1bda4f96e2 Set omitempty for IP and PublicPort to conform w/ API 1.18 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 09de92b891c15bda593cf47617f032d2b0b40605
Component: engine
 2015-06-12 09:49:53 -07:00
Arnaud Porterie
b25a623fe3 Merge pull request #13722 from samuelkarp/CpuShareRemoteAPI 
Adjust disallowed CpuShares in /containers/create
Upstream-commit: 71ead0ef5ce1f4e7c38631b1fc62d88cf29dba3e
Component: engine
 2015-06-11 14:20:50 -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
Brian Goff
5a71e1d7b0 Default events since to current time 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 74c12aa42918e3f349afcb46e6e54b724ef789a9
Component: engine
 2015-06-10 12:37:40 -04:00
Antonio Murdaca
6aab6b5654 Avoid nil pointer dereference while creating a container with an empty Config 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 4ce817796e639391f6bc3e338f5a88985daacaca
Component: engine
 2015-06-06 20:07:32 +02:00