0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23440 commits 14 branches 412 tags 338 MiB
Commit graph

1766 commits

Author SHA1 Message Date
Doug Davis
daced1d303 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>
 2015-07-10 12:51:34 -07:00
John Howard
615681f517 Windows: Remove meaningless warnings on docker info 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-10 10:06:20 -07:00
Ma Shimiao
9a4cbb358d api/client: unify format of args check 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-07-08 17:29:47 +08:00
Ma Shimiao
91a496055c api/client: close the returned io.ReadCloser 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-07-08 10:06:25 +08:00
Jessie Frazelle
2cd417df73 Merge pull request #14388 from runcom/14316-fix-events-filters 
Fix combined image events filters
 2015-07-07 18:08:56 -07:00
Doug Davis
26a35dd09b Merge pull request #14344 from Mashimiao/add-json-check-for-execcreate 
api/server: Add missing json check
 2015-07-05 19:04:12 -04:00
Antonio Murdaca
19e6de2654 Fix combined image events filters 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-04 00:19:08 +02:00
Ma Shimiao
801a7fed19 api/server: Add missing json check 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-07-03 08:52:32 +08:00
Ma Shimiao
87cfc2bc58 client/load: tiny typo fix 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-07-03 08:37:27 +08:00
David Calavera
71f8ca30ce Merge pull request #14359 from cpuguy83/14354_events_send_resp_immediately 
Send resp immediately on GET /events
 2015-07-02 12:00:45 -07:00
Brian Goff
d0a299c027 Send resp immediately on GET /events 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-07-02 11:45:24 -04:00
wlan0
9b782d3af3 add support for maximum log size, and max number of log files 
Signed-off-by: wlan0 <sidharthamn@gmail.com>
 2015-07-02 06:26:06 -07:00
Ma Shimiao
f38232b475 Unify docker commands' usage in man and help 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-07-02 10:33:26 +08:00
Sebastiaan van Stijn
98f988f62c Merge pull request #13187 from shishir-a412ed/docker_inspect_issue 
Flag Addition: --type flag added for docker inspect command
 2015-07-02 01:31:15 +02:00
Antonio Murdaca
88d32a6109 Fix regression in containers attach/wsattach api, return not found before hijacking 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-01 18:16:17 +02:00
Shishir Mahajan
2cb74e6915 Flag Addition: --type flag added for docker inspect command 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-07-01 12:14:01 -04:00
Alexander Morozov
caa4acc7b1 Merge pull request #14297 from pwaller/move-nat-pkg 
Move /nat to /pkg/nat
 2015-06-30 13:23:30 -07:00
Brian Goff
f13b40f6e7 Merge pull request #13524 from calavera/plugin_json_spec 
Plugins JSON spec.
 2015-06-30 15:44:48 -04:00
Peter Waller
9c2374d196 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>
 2015-06-30 17:43:17 +01:00
David Calavera
d543a01e17 Merge pull request #14061 from runcom/clean-builder-daemon-config 
Add struct to configure Builder commit
 2015-06-29 11:04:05 -07:00
David Calavera
333ac3a3eb Plugins JSON spec. 
Allow full configuration of external plugins via a JSON document.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-29 10:32:18 -07:00
Phil Estes
d175ef6773 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)
 2015-06-26 16:23:05 -07:00
John Howard
126529c6d0 Windows: Security warning based on server OS 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-26 10:33:45 -07:00
Alexander Morozov
f46ac8c51c Merge pull request #14162 from dnozay/patch-1 
more friendly message for when docker daemon is not running.
 2015-06-26 09:27:21 -07:00
Damien Nozay
e9ac7d24a7 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>
 2015-06-25 10:15:52 -07:00
Josh Hawn
02c7bbefb8 [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)
 2015-06-23 12:58:17 -07:00
David Calavera
aa4f495cae Merge pull request #13966 from mountkin/fix-stats-goroutine-leak 
fix the goroutine leak in the stats API if the container is not running
 2015-06-23 10:06:35 -07:00
Vincent Batts
5c93c265f6 Merge pull request #14047 from Microsoft/10662-versionadd 
Add build time to version and tidy output
 2015-06-23 09:57:31 -07:00
Shijiang Wei
1cbf5a54da fix the goroutine leak in the stats API if the container is not running 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-06-23 19:38:15 +08:00
John Howard
87eae0d659 Add branch and build time to version 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-22 13:00:27 -07:00
Sujith Haridasan
8a9ed09746 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>
 2015-06-22 11:44:33 +05:30
Arnaud Porterie
fef0e84b2d Merge pull request #14051 from mavenugo/services 
experimental services ui
 2015-06-20 18:24:37 -07:00
Sebastiaan van Stijn
67f9bbcbd4 Merge pull request #11907 from gcuisinier/11094-allow-import-from-file2 
fix #11094 - Allow 'docker import' to load from local files
 2015-06-20 12:17:58 -07:00
Antonio Murdaca
7046651b87 Add struct to configure Builder commit instead of using one defined in daemon 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-06-20 12:53:47 +02:00
Gildas Cuisinier
3f64b76d4c work on #11094 allow import from local file 
Signed-off-by: Gildas Cuisinier <gildas.cuisinier@gcuisinier.net>
 2015-06-20 09:04:43 +02:00
Alexander Morozov
e5ded9c378 Merge pull request #13997 from runcom/drop-old-client 
Error out if client API version is too old
 2015-06-19 17:05:39 -07:00
Madhu Venugopal
742db1737c attaching services api and UI chain to docker parent 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-06-19 09:19:09 -07:00
Madhu Venugopal
da5a3e6dee 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>
 2015-06-18 12:07:58 -07:00
Antonio Murdaca
910322a893 Error out if client API version is too old 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-06-18 11:03:07 +02:00
Antonio Murdaca
b6a6c56915 Remove missed code path for api < 1.12 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-06-17 17:00:48 +02:00
tgic
fe7b3658bd prompt a cli login if receive 401 from registry v2 auth server 
Signed-off-by: tgic <farmer1992@gmail.com>
 2015-06-17 19:28:13 +08:00
Lei Jitang
57d12a0e0a Add bridge-nf-call-iptables/bridge-nf-call-ipv6tables to docker info 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-06-17 09:19:11 +08:00
Vincent Batts
e69df2589c Merge pull request #13198 from rhvgoyal/extend-docker-inspect 
docker-inspect: Extend docker inspect to export image metadata related to graph driver
 2015-06-16 15:03:14 -05:00
Tibor Vass
d820e00aac Update vendored go.net to use golang.org/x/net canonical path 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-06-16 11:40:04 -04:00
Josh Hawn
86d6a5b11f Merge pull request #13869 from jlhawn/multi_line_help_usage 
api/client: Allow for multi-line usage help
 2015-06-15 14:50:17 -07:00
Vivek Goyal
407a626be6 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>
 2015-06-15 14:05:10 -04:00
Arnaud Porterie
cd36b15ccb Merge pull request #13860 from jlhawn/cli_call_headers 
api/client: have cli.call() return headers
 2015-06-13 09:14:40 -07:00
Arnaud Porterie
422fa7f0a6 Merge pull request #13749 from Microsoft/adduseragent 
Add GOOS in User-Agent
 2015-06-12 17:19:51 -07:00
John Howard
d2c5fcc8d5 Windows: Patch up compile after adjustCpuShares 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-12 13:00:59 -07:00
Antonio Murdaca
27e2837c6c Merge pull request #13911 from cpuguy83/13910_fix_stats_nostream_resp 
Fixes content-type/length for stats stream=false
 2015-06-12 19:53:18 +02:00