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
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
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
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
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
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
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
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
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
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
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
1ddffd6be6
Merge pull request #13636 from tiborvass/refactor-tls
...
Refactor TLS code with a new `tlsconfig` package
Upstream-commit: efe5c647684d8050ed174e0984d07de0f8489bbd
Component: engine
2015-06-05 10:16:24 -07:00
01de0478de
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 >
Upstream-commit: bfed4b7cc3820ee3a74580aca55d5918bf05eef5
Component: engine
2015-06-05 12:38:38 -04:00
9252f9c26a
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 >
Upstream-commit: ed39fbeb2ad3959f37cf6c16aaf30aacb3292817
Component: engine
2015-06-04 17:19:39 -07:00
3ebd8c1a62
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 >
Upstream-commit: 0c84604f5458bc38b793e5bcdf86624eef3e3184
Component: engine
2015-06-04 13:56:40 -07:00
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
d446c85a16
Merge pull request #13731 from jfrazelle/fix-version-on-old-versions
...
fix version struct on old versions
Upstream-commit: f37e6e180f67db73e8db9f3eaebb84a42fc01914
Component: engine
2015-06-03 17:24:53 -07:00
736776362e
fix version struct on old versions
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 229b599259b24b30fdecbb70bdbba417a81e9723
Component: engine
2015-06-03 16:56:50 -07:00
e28afd6060
SizeRW & SizeRootFs omitted if empty in /container/json call
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 6945ac2d02adbe2931c9e8756ecbb7496b43081a
Component: engine
2015-06-03 23:13:56 +02:00
10b1c5b724
Merge pull request #13712 from LK4D4/fix_leak_events
...
Support CloseNotifier for events
Upstream-commit: ad56d797d3cbac8d02fe2542f5673bbdd3d862b8
Component: engine
2015-06-03 13:43:39 -07:00
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
30f311bc4f
Support CloseNotifier for events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 9e7fc245a79535984c3e0dd3d2c4f042e92cdc6a
Component: engine
2015-06-03 11:42:51 -07:00
90d04ee342
Do not omit empty json field in /containers/json api response
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 725f34151c5f86b0b50f6e5601223e6da194af1b
Component: engine
2015-06-03 18:53:40 +02:00
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
5276323624
Expose old config field for api < 1.19
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6deaa58ba5f051039643cedceee97c8695e2af74
Component: engine
2015-06-02 23:37:59 +02:00
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
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
35a3ad8b0c
Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled
...
Fix wrong kill signal parsing
Upstream-commit: 2de2782fe89cf2793e868161985a3d7f764520df
Component: engine
2015-06-02 09:40:55 -07:00
66c03ea423
Fix wrong kill signal parsing
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com >
Upstream-commit: 39eec4c25bce6291534f9524dc52de65787d5b6e
Component: engine
2015-06-02 18:01:19 +02:00
f6a914544f
Merge pull request #13609 from Microsoft/10662-refixserverwindows
...
Windows: Fix windows to match linux after compile break
Upstream-commit: 05b1d02423179a32d9fed4f786af125054caec4c
Component: engine
2015-06-01 17:03:13 -07:00
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
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
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
c1e042a6e9
Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental
...
fix release script for experimental
Upstream-commit: d37aad170ffe75eeaaea07d52863a6159417e5d6
Component: engine
2015-06-01 12:29:45 -04:00
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
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
0b80863b93
Windows: Refix server_windows to match linux
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2b7569ccc359a1925dbf48f88a2f2a61c277bc32
Component: engine
2015-05-29 21:25:27 -07:00
4f53f1bb13
Merge pull request #13425 from runcom/13421-stats-default-stream
...
Fix regression in stats API endpoint
Upstream-commit: 4389fc8bf975a5df567c8431dda82d19a09733a3
Component: engine
2015-05-29 15:05:21 -07:00
9b9477d660
Merge pull request #13567 from draghuram/apiver
...
Make the version mismatch message more explicit.
Upstream-commit: d79654d0f67c88ceb6b6c2747a2402d248ecea45
Component: engine
2015-05-29 23:39:48 +02:00
2b62e414ad
Fix regression in stats API endpoint where stream query param default is true
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ec97f414657189f2ce95d6b5bda26aa9d206b705
Component: engine
2015-05-29 22:38:36 +02:00
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
16f1d90a66
bump api version to 1.20
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: e76d0f55717e08eff68604a52f0b2f1d7c27809c
Component: engine
2015-05-28 15:32:05 -07:00
9a122de919
Make the version mismatch message more explicit.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 7b6f9da52c961da18e2a91c4fcb8f124880244d8
Component: engine
2015-05-28 17:54:48 -04:00
5c975d5605
Merge pull request #13559 from LK4D4/fix_systemd_listen
...
Treat systemd listeners as all other
Upstream-commit: 1f22676fcb2c6f2bd1a1cbf6123587c4d4e917d0
Component: engine
2015-05-28 14:15:34 -07:00
147b33c180
Treat systemd listeners as all other
...
Fix #13549
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6f9fa64645cd67eb10a9c8bd903df518d572f50d
Component: engine
2015-05-28 12:15:03 -07:00
9749c4b6ff
Merge pull request #13428 from duglin/niceHelp2
...
Nice help2
Upstream-commit: 617a0c2fde69f2954c2d8959e23e1459636f753e
Component: engine
2015-05-28 11:09:02 -07:00
abc263e355
Merge pull request #13259 from Microsoft/10662-configbridge
...
Windows: factor out bridgeConfig from server+config
Upstream-commit: 45488f9dc0e2ad5087776445e2069a9ea2c8bf80
Component: engine
2015-05-28 12:59:57 -04:00
5e9b1d1a70
Merge pull request #13269 from Microsoft/10662-statsrefactor
...
Windows: refactor stats
Upstream-commit: 27919bab2d538961ecdcd06a095d1e9d310621c5
Component: engine
2015-05-28 12:46:34 -04:00
773a1624ef
Merge pull request #13507 from hqhq/hq_remove_redundant_set_header
...
Remove redundant set header
Upstream-commit: 7b57fae04668cc4841f0d31f8ce16ac8d044b446
Component: engine
2015-05-27 10:44:57 -07:00
a7e8383688
Remove redundant set header
...
Which is already done in writeJSON.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 94d604357ff9cf7a5fcc4d98ffe58f804adf0ae6
Component: engine
2015-05-27 18:25:57 +08:00
