toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,384 Commits 3 Branches 295 Tags
e768870c69537e7e4ee380f59fa1dc2d417860c5
Commit Graph
32384 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Goff e768870c69 Merge pull request #32987 from allencloud/add-swarm-get-unlock-key-test-in-client 
add swarm get unlock key test for client package
Upstream-commit: 3183031581d16e06b5386b1860ea6bfaa734ebce
Component: engine
 2017-05-15 09:56:43 -04:00
Justin Cormack c9d2f6b467 Merge pull request #33197 from thaJeztah/remove-libzfs-dev-dependency 
Remove zfs from static builds
Upstream-commit: d841da9379c7d08408c55bfa5d24276826362b23
Component: engine
 2017-05-15 14:48:38 +01:00
Sebastiaan van Stijn f0d9aa77cb Merge pull request #32856 from darrenstahlmsft/RemoveResourceComments 
Remove comments and unused structures in Windows resources
Upstream-commit: 6bffb585cda7d4064b803ed3d8b110a7c2d21d94
Component: engine
 2017-05-15 15:28:51 +02:00
Sebastiaan van Stijn 5aed6562af Merge pull request #33131 from johnstep/windows-build-client-temp 
Build client on Windows in a temporary directory
Upstream-commit: 23359fd4035029c98a329bae5cf78626f3f15419
Component: engine
 2017-05-15 15:22:00 +02:00
Sebastiaan van Stijn 81db28deb9 Merge pull request #32996 from dperny/service-logs-support-details 
Fix Ambigious Logs Format and Add Support for Details in Service Logs
Upstream-commit: 7fd8a9382c0fd3f23002288e357b5612b869a974
Component: engine
 2017-05-15 13:57:44 +02:00
Sebastiaan van Stijn 44195b7547 Merge pull request #33184 from dnephin/doc-arg-before-from 
Document arg before from
Upstream-commit: 99b5fadd0ce6edf066d5797f14c0ba452c8ddf23
Component: engine
 2017-05-15 13:35:23 +02:00
Sebastiaan van Stijn 03266822c8 Remove zfs from static builds 
The libzfs-dev package is not needed for the static builds,
and only used for ubuntu packages, so removing from
the Dockerfile.

This resolves an issue where build fails due to the PPA
having changed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8022c5fdd12ae6dc5aac3c9e59f5524954b55730
Component: engine
 2017-05-15 13:22:52 +02:00
Vincent Demeester 6879ffc828 Merge pull request #33146 from Microsoft/jjh/TestAPIStatsNoStreamGetCpu 
Fix flaky TestAPIStatsNoStreamGetCpu
Upstream-commit: 8a03eb0b6cc56879eada4a928c6314f33001fc83
Component: engine
 2017-05-15 11:21:53 +02:00
Doug Davis 9d09c6e973 Merge pull request #33188 from allencloud/fix-nits-in-function-comments 
fix typos in function comments
Upstream-commit: 5072b22c5fea93f00917c8c5d6a29d782db2bb73
Component: engine
 2017-05-14 08:17:28 -04:00
allencloud 462508ec1a fix typos in function comments 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 4a98f9ef7fdb6f6f77516fb030293fbc0ff659dc
Component: engine
 2017-05-14 13:05:41 +08:00
Kenfe-Mickaël Laventure 418f2b9f51 Merge pull request #33179 from tonistiigi/fix-from-scratch 
Fix resetting image metadata between stages for scratch case
Upstream-commit: 4e0fdc9098e2ff9e4e78287f8d60aef8af465d55
Component: engine
 2017-05-13 21:17:02 -07:00
Kenfe-Mickaël Laventure 537a743ad7 Merge pull request #33182 from cyli/exclusive-root-pools-in-daemon 
Use exclusive root pools if a CA cert file is specified in the daemon
Upstream-commit: 190c6e8cf8b893874a33d83f78307f1bed0bfbcd
Component: engine
 2017-05-13 21:15:42 -07:00
allencloud 25f28a5159 add swarm get unlock key test for client package 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: a86023eaa93f18bfefb345a5e13c88156abaa6fa
Component: engine
 2017-05-14 11:09:19 +08:00
Sebastiaan van Stijn e5c39230b9 Merge pull request #32700 from jphuynh/more-maintainer-deprecation 
MAINTAINER deprecation follow up. Relates to #25466
Upstream-commit: 20255ade2965440d22e149cdd7c32e207f6918ba
Component: engine
 2017-05-13 17:28:52 +02:00
Sebastiaan van Stijn 231fefa0c5 Merge pull request #33174 from thaJeztah/update-authors 
Update AUTHORS and mailmap
Upstream-commit: c56cfbaf966af0b7b559e4188bcf83340e7bb1cc
Component: engine
 2017-05-13 17:25:31 +02:00
Daniel Nephin 409ca07fc0 Document arg before from 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 83a4afe2645d2e39cf6b10a86e9e681a7ff06eb2
Component: engine
 2017-05-12 18:45:08 -04:00
Tibor Vass a00f1ffcd6 Merge pull request #32874 from cpuguy83/metrics_plugins 
Add support for metrics plugins
Upstream-commit: 680084b2a2eb1ac1ced2dd4c695fdc469c25dc7f
Component: engine
 2017-05-12 15:44:34 -07:00
Ying Li deaa6eb130 Use exclusive root pools if a CA cert file is specified in the daemon 
Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: ddd5278b07b1c2b12b906244153fd9340e0d7910
Component: engine
 2017-05-12 14:43:34 -07:00
Tonis Tiigi 033ef466ec Fix resetting image metadata between stages for scratch case 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b192218503427a49b6de0a093e38e2697a22427a
Component: engine
 2017-05-12 12:00:55 -07:00
Drew Erny 51fcae249a Change log details encoding format and support details on service logs 
URL query encode log details, so that characters like spaces don't make
log parsing ambiguous. Add a helper function to parse these details to a
map, if needed

Add support for details on service logs

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 68f21418ac1f1acb2874b45878a5938475becf1f
Component: engine
 2017-05-12 10:53:44 -07:00
Aaron Lehmann d7fd55d70a Merge pull request #32993 from cyli/root-rotation-cli 
API changes to rotate swarm root CA
Upstream-commit: eb8abc95985bf3882a4a177c409a96e36e25f5b7
Component: engine
 2017-05-12 10:12:32 -07:00
Sebastiaan van Stijn b5058fb7d9 Update AUTHORS and mailmap 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 671805cce01b84edbf53ab721fc4f509beb71a1a
Component: engine
 2017-05-12 16:45:49 +02:00
Brian Goff c4c8c3a703 Merge pull request #32437 from cpuguy83/container_selinux 
Rely on container-selinux for centos/fedora25/rhel
Upstream-commit: c307f4521edc58df347897c84159f25606cae597
Component: engine
 2017-05-12 09:23:17 -04:00
Brian Goff e9abb077b7 Add support for metrics plugins 
Allows for a plugin type that can be used to scrape metrics.
This is useful because metrics are not neccessarily at a standard
location... `--metrics-addr` must be set, and must currently be a TCP
socket.
Even if metrics are done via a unix socket, there's no guarentee where
the socket may be located on the system, making bind-mounting such a
socket into a container difficult (and racey, failure-prone on daemon
restart).

Metrics plugins side-step this issue by always listening on a unix
socket and then bind-mounting that into a known path in the plugin
container.

Note there has been similar work in the past (and ultimately punted at
the time) for consistent access to the Docker API from within a
container.

Why not add metrics to the Docker API and just provide a plugin with
access to the Docker API? Certainly this can be useful, but gives a lot
of control/access to a plugin that may only need the metrics. We can
look at supporting API plugins separately for this reason.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 0e8e8f0f318656be80e34db9b5e390ffeef3fd0d
Component: engine
 2017-05-12 00:30:09 -04:00
Evan Hazlett a16746fe29 Merge pull request #33164 from thaJeztah/add-secret-to-service-create-example 
Add "secrets" example for service create API docs
Upstream-commit: 12458662495e7c8f63e4f86e8a7207403ab82957
Component: engine
 2017-05-11 23:42:58 -04:00
Evan Hazlett 8a6877a0a3 Merge pull request #33166 from thaJeztah/fix-secret-response-example 
Fix secret/{id} response example
Upstream-commit: 6e83ef6ad6d12d5952649bd3645a5d2b6ea2b80b
Component: engine
 2017-05-11 23:42:04 -04:00
Aaron Lehmann 39aaf216f3 Merge pull request #31142 from dongluochen/network_converge_delay 
add 2 seconds delay to allow gossip converge
Upstream-commit: 8fd55cd064dbe6dd3d2cdea6c778532faf24b8fa
Component: engine
 2017-05-11 16:50:44 -07:00
Sebastiaan van Stijn 15d274d7a1 Merge pull request #33049 from albers/completion-log-options 
Update bash completion for log driver options
Upstream-commit: d8908c3467683f9638abb85ae4d745e8821467d2
Component: engine
 2017-05-12 01:02:34 +02:00
Sebastiaan van Stijn 887d3ac7d1 Merge pull request #33108 from justincormack/revert-seccomp-sockets 
Revert "Block obsolete socket families in the default seccomp profile"
Upstream-commit: 33ebf32cb0d0b865d002e8afd0c35b6474f04eb6
Component: engine
 2017-05-12 00:30:08 +02:00
Victor Vieux cb58c9e54e Merge pull request #32336 from aaronlehmann/configs 
Configuration files for services
Upstream-commit: 69c35dad8e7ec21de32d42b9dd606d3416ae1566
Component: engine
 2017-05-11 13:25:40 -07:00
Sebastiaan van Stijn 8d785cac10 Merge pull request #32587 from dmcgowan/trust-key-config 
Expose trust key path in config
Upstream-commit: 577168700200e8e993b2692ef87e05a67783a08c
Component: engine
 2017-05-11 21:03:47 +02:00
Ying Li 4b2490c791 Add API test to rotate the swarm CA certificate 
Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 376c75d13cedd22c578197a140ffc10e27e84d01
Component: engine
 2017-05-11 11:13:14 -07:00
Ying Li 59422fa37f Update the stream formatter to display custom unit numbers. 
Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: a771c16834c92cb39142078c64e253423f0fb4e3
Component: engine
 2017-05-11 11:13:11 -07:00
Ying Li dbf4ba7522 Propagate the desired CA certificate and CAConfig ForceRotate parameter 
in the Docker REST APIs when viewing or updating the swarm spec info, and
also propagate the desired CA key in the Docker REST APIs when updating
swarm spec info only (it is not available for viewing).

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 1847bb899a07d3dd324e75a3ed9b3489fcfc302f
Component: engine
 2017-05-11 10:22:42 -07:00
Aaron Lehmann 53e0ae35b8 Add integration test coverage for configs 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d2c5b6ee9f5240e23aa9fa0f374b89a9726d2200
Component: engine
 2017-05-11 10:18:44 -07:00
Aaron Lehmann cc8ec748f5 Vendor CLI fork for integration tests 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 1f1befdcf5c7a48190469aabdd74a16397eb4192
Component: engine
 2017-05-11 10:18:44 -07:00
Aaron Lehmann efc30370d8 Add config support to executor backend 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 9e9fc7b57c1764c008e568ed52bcd1aade7eb40c
Component: engine
 2017-05-11 10:08:21 -07:00
Aaron Lehmann b9c54e0c42 Update CLI docs and add opts/config.go 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: a58cc35ab8ae771dedcf29054b1b077cbf1ea2e2
Component: engine
 2017-05-11 10:08:21 -07:00
Aaron Lehmann f1fba04069 Add configs support to client 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 102738101a68711c2ca50e36b24d389c35d087df
Component: engine
 2017-05-11 10:08:21 -07:00
Aaron Lehmann 42c7989190 Add config APIs 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 772855768785ce678751795c168e056a8db35d09
Component: engine
 2017-05-11 10:08:21 -07:00
Brian Goff 619aeaa2ea Merge pull request #32127 from ripcurld0/redirect_go18 
Return error on client redirect
Upstream-commit: e3a30ffca68742c6569a26fd01a86da03f4f8aeb
Component: engine
 2017-05-11 12:48:56 -04:00
Sebastiaan van Stijn 34d74ed853 Fix secret/{id} response example 
Fixes a warning that was shown;

    Warning: Other properties are defined at the same level as $ref at
    "#/paths/~1secrets~1{id}/get/responses/200/schema". They are IGNORED according
    to the JsonSchema spec

That resulted in the example not being
rendered in the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f3bcea00cd0de1f874728142babd7b10b379cf15
Component: engine
 2017-05-11 18:02:19 +02:00
Sebastiaan van Stijn 841ec601d8 Add "secrets" example for service create API docs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3e7c1b9a99a0e86abac00fbda87d3d961c1fa0f5
Component: engine
 2017-05-11 17:46:10 +02:00
Daniel Nephin 2c6473821e Merge pull request #33054 from dnephin/refactor-builder-named-contexts-interface 
[Builder] Expose GetImage interface for builder
Upstream-commit: 974cec945b80bc0004f3917ec318c15e9c038e4a
Component: engine
 2017-05-11 11:03:30 -04:00
Boaz Shuster 9d2b3f6463 Return error on client redirect 
From Go 1.8 HTTP client redirect behaviour is changed:
When status code is 301, 307 or 308, the client
automatically converts it to a new HTTP request.

This behaviour change manifests in the client in that
before the 301 was not followed and the client did not generate
an error, but now results in an error message:
"Error response from daemon: page not found."

To fix that a new redirect policy is forced by setting
HTTP Client's CheckRedirect.
That policy is to return an error for any 301, 307 or 308
in the response's status code to a non-GET request.
The error message specifies that the daemon could not
process the request and it is probably due to bad
arguments that were provided by the user.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: eb36d6021618f788012c166a533f1b321cda9695
Component: engine
 2017-05-11 15:39:41 +03:00
Madhu Venugopal cfa3cb0b21 Merge pull request #32906 from fcrisciani/init_race_cond 
Race condition fix for swarm join/leave
Upstream-commit: 77d5a0996f0e007330424ea4740e908fd887cf37
Component: engine
 2017-05-11 05:18:40 -07:00
Madhu Venugopal 4a4d032afd Merge pull request #29030 from cpuguy83/go18_test 
Update go to 1.8
Upstream-commit: ff86a9196bbb5a0410782f9171699680409c9465
Component: engine
 2017-05-11 05:18:12 -07:00
Sebastiaan van Stijn 9145e727fb Merge pull request #33147 from nishanttotla/docs-update-distribution-json-endpoint 
Updating API Changelog to add /distribution/{name}/json endpoint
Upstream-commit: 1f55b71ff904e7c20fee6b4018ba5115749a249c
Component: engine
 2017-05-11 12:16:43 +02:00
Nishant Totla cb4ffe6d3e Updating API Changelog to add /distribution/{name}/json endpoint 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a89dd03c26885bb69450b28f10ef002cde0dadb7
Component: engine
 2017-05-11 12:15:00 +02:00
Flavio Crisciani 1469dbf703 Libnetwork vendoring 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: 385176980ef6c6f322c78d76bd2f98875e6aee69
Component: engine
 2017-05-10 21:16:57 -07:00