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
Brian Goff
855a056af7 Fixes content-type/length for stats stream=false 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-12 13:06:06 -04:00
Darren Shepherd
09de92b891 Set omitempty for IP and PublicPort to conform w/ API 1.18 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-06-12 09:49:53 -07:00
Arnaud Porterie
71ead0ef5c Merge pull request #13722 from samuelkarp/CpuShareRemoteAPI 
Adjust disallowed CpuShares in /containers/create
 2015-06-11 14:20:50 -07:00
Josh Hawn
0cdc3b7539 api/client: have cli.call() return headers 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-06-10 16:20:13 -07:00
Josh Hawn
4cb0c93f92 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)
 2015-06-10 16:14:45 -07:00
John Howard
84aec1e8e6 Typo fix in api\client\utils.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-10 15:24:53 -07:00
Brian Goff
74c12aa429 Default events since to current time 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-10 12:37:40 -04:00
Antonio Murdaca
4ce817796e Avoid nil pointer dereference while creating a container with an empty Config 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-06-06 20:07:32 +02:00
Arnaud Porterie
efe5c64768 Merge pull request #13636 from tiborvass/refactor-tls 
Refactor TLS code with a new `tlsconfig` package
 2015-06-05 10:16:24 -07:00
Tibor Vass
bfed4b7cc3 Refactor TLS code with a new tlsconfig package 
This patch creates a new `tlsconfig` package to handle creation of
secure-enough TLS configurations for clients and servers.

The package was created by refactoring TLS code in the client and the
daemon. After this patch, it is expected that all code creating TLS
configurations use this `tlsconfig` package for greater security,
consistency and readability.

On the server side, this fixes a bug where --tlsverify was not taken
into account. Now, if specified, it will require the client to
authenticate.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-06-05 12:38:38 -04:00
Samuel Karp
ed39fbeb2a Adjust disallowed CpuShares in /containers/create 
Previous versions of libcontainer allowed CpuShares that were greater
than the maximum or less than the minimum supported by the kernel, and
relied on the kernel to do the right thing. Newer libcontainer fails
after creating the container if the requested CpuShares is different
from what was actually created by the kernel, which breaks compatibility
with earlier Docker Remote API versions. This change explicitly adjusts
the requested CpuShares in API versions < 1.20.

Signed-off-by: Samuel Karp <skarp@amazon.com>
 2015-06-04 17:19:39 -07:00
Brian Goff
0c84604f54 Fix goroutine leak on logs -f with no output 
Also noticed potential hang when only stdout or stderr are used with
follow=1

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-04 13:56:40 -07:00
John Howard
543cf79ffb Add GOOS in User-Agent 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-04 13:37:41 -07:00
Arnaud Porterie
f37e6e180f Merge pull request #13731 from jfrazelle/fix-version-on-old-versions 
fix version struct on old versions
 2015-06-03 17:24:53 -07:00
Jessica Frazelle
229b599259 fix version struct on old versions 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-06-03 16:56:50 -07:00
Antonio Murdaca
6945ac2d02 SizeRW & SizeRootFs omitted if empty in /container/json call 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-06-03 23:13:56 +02:00
Arnaud Porterie
ad56d797d3 Merge pull request #13712 from LK4D4/fix_leak_events 
Support CloseNotifier for events
 2015-06-03 13:43:39 -07:00
Antonio Murdaca
f18ce101fb Merge pull request #13165 from ahmetalpbalkan/durations 
Allow duration strings as --since/--until
 2015-06-03 22:14:42 +02:00
Alexander Morozov
9e7fc245a7 Support CloseNotifier for events 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-03 11:42:51 -07:00
Antonio Murdaca
725f34151c Do not omit empty json field in /containers/json api response 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-06-03 18:53:40 +02:00
Qiang Huang
01a9a9284f Add comment about inspect output 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-06-03 17:35:57 +08:00
Antonio Murdaca
6deaa58ba5 Expose old config field for api < 1.19 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-06-02 23:37:59 +02:00
Ahmet Alp Balkan
4e3b21f99e 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>
 2015-06-02 21:02:47 +00:00
David Calavera
814a92c5a1 Merge pull request #13607 from vieux/PrintfIfNotEmpty 
do not print empty values in docker info
 2015-06-02 10:52:45 -07:00
Arnaud Porterie
2de2782fe8 Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled 
Fix wrong kill signal parsing
 2015-06-02 09:40:55 -07:00
Antonio Murdaca
39eec4c25b Fix wrong kill signal parsing 
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com>
 2015-06-02 18:01:19 +02:00
Arnaud Porterie
05b1d02423 Merge pull request #13609 from Microsoft/10662-refixserverwindows 
Windows: Fix windows to match linux after compile break
 2015-06-01 17:03:13 -07:00
Jessie Frazelle
aa8d8fdc0c Merge pull request #13611 from duglin/Issue13417a 
Allow .dockerignore to ignore everything
 2015-06-01 15:59:57 -07:00
Victor Vieux
c790aa36ea no not print empty keys in docker info 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-01 15:05:20 -07:00
Brian Goff
a7005c44b5 Merge pull request #13320 from coolljt0725/add_stats_no_stream_show_cpu_usage 
Add docker stats --no-stream show cpu usage
 2015-06-01 09:40:04 -07:00
Phil Estes
d37aad170f Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental 
fix release script for experimental
 2015-06-01 12:29:45 -04:00
Lei Jitang
96123a1fd5 Add docker stats --no-stream show cpu usage 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-31 01:25:51 +08:00
Doug Davis
82ea6ed2bc 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>
 2015-05-30 04:16:00 -07:00
John Howard
2b7569ccc3 Windows: Refix server_windows to match linux 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-29 21:25:27 -07:00
David Calavera
4389fc8bf9 Merge pull request #13425 from runcom/13421-stats-default-stream 
Fix regression in stats API endpoint
 2015-05-29 15:05:21 -07:00
Antonio Murdaca
d79654d0f6 Merge pull request #13567 from draghuram/apiver 
Make the version mismatch message more explicit.
 2015-05-29 23:39:48 +02:00
Antonio Murdaca
ec97f41465 Fix regression in stats API endpoint where stream query param default is true 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-29 22:38:36 +02:00
Jessica Frazelle
b372f9f224 fix experimental version and release script 
add api version experimental

Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-29 10:00:22 -07:00
Jessica Frazelle
e76d0f5571 bump api version to 1.20 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-28 15:32:05 -07:00
Raghuram Devarakonda
7b6f9da52c Make the version mismatch message more explicit. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-05-28 17:54:48 -04:00
Jessie Frazelle
1f22676fcb Merge pull request #13559 from LK4D4/fix_systemd_listen 
Treat systemd listeners as all other
 2015-05-28 14:15:34 -07:00
Alexander Morozov
6f9fa64645 Treat systemd listeners as all other 
Fix #13549

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-28 12:15:03 -07:00
David Calavera
617a0c2fde Merge pull request #13428 from duglin/niceHelp2 
Nice help2
 2015-05-28 11:09:02 -07:00
Brian Goff
45488f9dc0 Merge pull request #13259 from Microsoft/10662-configbridge 
Windows: factor out bridgeConfig from server+config
 2015-05-28 12:59:57 -04:00
Brian Goff
27919bab2d Merge pull request #13269 from Microsoft/10662-statsrefactor 
Windows: refactor stats
 2015-05-28 12:46:34 -04:00
Alexander Morozov
7b57fae046 Merge pull request #13507 from hqhq/hq_remove_redundant_set_header 
Remove redundant set header
 2015-05-27 10:44:57 -07:00
Qiang Huang
94d604357f Remove redundant set header 
Which is already done in writeJSON.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-27 18:25:57 +08:00
Qiang Huang
7c7aebfcfe Return err if we got err on parseForm 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-27 18:16:28 +08:00
Antonio Murdaca
77280a87b7 Fix race in stats cli and native driver 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-26 13:55:02 +02:00
John Howard
ead2f80073 Windows: factor out bridge server+config 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-23 19:22:06 -07:00