toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,900 Commits 3 Branches 295 Tags
v17.06.2-ce
Commit Graph
36900 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Norberg f2632ce254 variable declaration cleanup 
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: 5684997e54
Component: cli
 2017-05-15 11:57:11 +02:00
Daniel Norberg 261c179e16 configurable dns search domains 
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: bdc62769d3
Component: cli
 2017-05-15 11:57:11 +02:00
Victor Vieux de7386fb67 move opts out of pkg because it's related to docker 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: c6c287cddc
Component: cli
 2017-05-15 11:57:11 +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
zhangxiaoyu-zidif a1d5efdf77 server.go: format for 
Signed-off-by: zhangxiaoyu-zidif <zhang.xiaoyu33@zte.com.cn>
Upstream-commit: 1ab62a0b4daa6b643fc140d3ec8661ef407ec3b1
Component: engine
 2017-05-15 07:12:28 +08:00
Justin Menga 2d5cb49e4e Update comments describing new behaviour 
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: dc87490b632949394307e25dce17c8db6cf664c6
Component: engine
 2017-05-15 11:08:16 +12:00
Justin Menga 2373c13c5a Code review changes 
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: 3a4cf2b076a8f04f54b6edff4f661f5c3b2c8157
Component: engine
 2017-05-15 10:28:18 +12: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
Daniel Nephin 71ca4e1c02 osx cross 
Fix CI build

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a408fb0a61
Component: cli
 2017-05-13 13:47:00 -04: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
Justin Menga 6083b78b58 Add missing month in datetime map 
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: bf1c377f6012f3db714e0f848d70e776ef1226a6
Component: engine
 2017-05-13 22:10:51 +12:00
Justin Menga 3ac82c3d80 Append new line to multiline events 
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: 4374f16667708118c126cd71f733493b0070e807
Component: engine
 2017-05-13 17:54:04 +12:00
Justin Menga 7dd003d1da Code review changes 
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: 8ef9c19ecdd16881289a63e5e89de3f5c83def66
Component: engine
 2017-05-13 17:54:04 +12:00
Tibor Vass 38049ee803 awslogs: use github.com/pkg/errors to wrap an error 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: f775005a17c7ae0d3851cc86f46b7c46aafa27d8
Component: engine
 2017-05-13 17:54:04 +12:00
Justin Menga 17b96f5ff1 Formatting 
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: 6f073e352247217a4cc5ee825676a9a496655455
Component: engine
 2017-05-13 17:54:04 +12:00
Justin Menga 4221bdc95f Add awslogs benchmarks 
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: 84b03660dab03ac366d99ba817a5ec8523808386
Component: engine
 2017-05-13 17:54:04 +12:00
Justin Menga db722ea7f6 Add awslogs multiline support 
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: ab74038df93156ef27c03d6e4490bca5c3359423
Component: engine
 2017-05-13 17:54:04 +12:00
Aaron Lehmann 73273d4d5a Update go-metrics to match swarmkit's dependency 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 0a377b5f56181c59f68c21cf4c5507218f0109ac
Component: engine
 2017-05-12 17:40:46 -07:00
Aaron Lehmann 7538411c99 Vendor swarmkit ae29cf2 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 721b7a7fadb7f43be4e9b1658ae76e6c91067dbf
Component: engine
 2017-05-12 17:36:11 -07:00
Aaron Lehmann 38f0a8a08c Merge pull request #44 from cyli/root-ca-info-in-cli 
Swarm cluster and node TLS info in CLI
Upstream-commit: 35c8732dc9
Component: cli
 2017-05-12 17:19:23 -07: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
Brian Goff 01a11eea42 Merge pull request #45 from aaronlehmann/configs 
Add support for configs
Upstream-commit: 05267be05b
Component: cli
 2017-05-12 14:03:53 -04: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 31f26ea6ab TestAPISwarmServicesUpdateStartFirst: Increase timeout on health check command 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 47436e9628149e7077a8e89c2fcac2a8f85bc62a
Component: engine
 2017-05-12 10:42:29 -07:00
Daniel Nephin fa3049db08 Add windows and linux cross. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 84a77889c3
Component: cli
 2017-05-12 13:34:13 -04:00
Daniel Nephin 564519acec Support building a dynbinary 
Cleanup dynbinary and binary builds

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a787cbc93b
Component: cli
 2017-05-12 13:34:06 -04: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 18f96c6ddf Merge pull request #70 from docker/compose-template-substitute-error-signature 
Return an error instead of an `*InvalidTemplateError`
Upstream-commit: bb1a403080
Component: cli
 2017-05-12 16:51:37 +02: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
Aaron Lehmann 41f722d69f Add support for configs 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: db5620026d
Component: cli
 2017-05-11 13:42:49 -07:00
Aaron Lehmann d92a25ada7 Vendor docker/docker 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 15b5dda768
Component: cli
 2017-05-11 13:42:46 -07: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