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
3f04cb0ed2
Merge pull request #14051 from mavenugo/services
...
experimental services ui
Upstream-commit: fef0e84b2df31ba12fa46984e3564f9daa6f576d
Component: engine
2015-06-20 18:24:37 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
