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

347 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Arnaud Porterie
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
Tibor Vass
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
Samuel Karp
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
Brian Goff
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
John Howard
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
Jessica Frazelle
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
Alexander Morozov
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
Antonio Murdaca
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
Arnaud Porterie
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
Antonio Murdaca
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
Arnaud Porterie
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
Phil Estes
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
John Howard
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
David Calavera
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
Antonio Murdaca
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
Jessica Frazelle
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
Raghuram Devarakonda
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
Jessie Frazelle
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
Alexander Morozov
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
Brian Goff
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
Alexander Morozov
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
Qiang Huang
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
Qiang Huang
d3998344e0 Return err if we got err on parseForm 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 7c7aebfcfef46337aa4e20f9d024916f71650545
Component: engine
 2015-05-27 18:16:28 +08:00
John Howard
08d07187fd Windows: factor out bridge server+config 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ead2f80073623cb53ade435811b155fe69f2774e
Component: engine
 2015-05-23 19:22:06 -07:00
David Calavera
7811ce8b6f Extract sockets initialization to a package. 
Because I just used it somewhere else and it would be nice if I didn't have to copy and paste the code.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0bfbc6e78823fc2f455b01a02721f17bcbcaecff
Component: engine
 2015-05-20 16:48:39 -07:00
Alexander Morozov
baf6ea6d24 Merge pull request #13324 from duglin/BadRCOnVersion 
Make version check return 400 instead of 404
Upstream-commit: 53a795378ddb092fc6da8c05ff442f5ed52b7bdb
Component: engine
 2015-05-20 11:13:56 -07:00
Jana Radhakrishnan
13426de5e6 Docker integration with libnetwork 
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
    - Reworked daemon to allocate network resources using libnetwork.
    - Reworked remove link code to also update network resources in libnetwork.
    - Adjusted the exec driver command population to reflect libnetwork design.
    - Adjusted the exec driver create command steps.
    - Updated a few test cases to reflect the change in design.
    - Removed the dns setup code from docker as resolv.conf is entirely managed
      in libnetwork.
    - Integrated with lxc exec driver.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: d18919e304c240df84502cdcc5ed655d92d12d4f
Component: engine
 2015-05-19 22:40:19 +00:00
Doug Davis
bca5faa4ca Make version check return 400 instead of 404 
Closes: #13321

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 7fcf849749322b3e02ae0305f40e505e83b54e9a
Component: engine
 2015-05-19 11:21:05 -07:00
Brian Goff
3c170ee3af Merge pull request #13271 from Microsoft/10662-nounixsocket 
Windows: No unix_socket.go
Upstream-commit: 692b7b911ede20eda92bf8b0b9cdd81b901de1fd
Component: engine
 2015-05-16 21:34:15 -04:00
Alexander Morozov
c8d066f882 Merge pull request #13237 from ahmetalpbalkan/tag/event 
Introduce daemon event 'tag' upon image tagging
Upstream-commit: b5e932a3bf1e9ba2682f0c3df2cc8fdf51f60229
Component: engine
 2015-05-16 09:05:03 -07:00
John Howard
5e2fb0c11a Windows: No unix_socket.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6c187b8b4b5110ff416e09e34a2a73304d01044d
Component: engine
 2015-05-15 15:49:02 -07:00
Ahmet Alp Balkan
540e90ab62 Introduce daemon event 'tag' upon image tagging 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 1630ed97acc7bc3a08b57ce5acaa3d8e37a24694
Component: engine
 2015-05-15 20:21:59 +00:00
Victor Vieux
56ea157723 Revert "Fix inconsistent date formats in API" 
This reverts commit 945fc9d882324ac87505e34bb74e6ebe30be1309.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: b261ce5fb007371892bc40a5853337db09a1c8ae
Component: engine
 2015-05-14 17:31:45 -07:00
Brian Goff
59274bcf1f Merge pull request #13202 from duglin/ImportFix 
Fix a regression in `docker import` on error from URL
Upstream-commit: ac81cd1fc36c57b0275992f5e6586728c41dc068
Component: engine
 2015-05-14 10:36:50 -04:00