toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,472 Commits 3 Branches 295 Tags
f4e4bf60abc44ed5258a021821ed433ccb54caef
Commit Graph
32472 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass f61bb3cd6b Merge pull request #33208 from johnstep/fix-windows-client-build 
Fix make.ps1 client build for Windows
Upstream-commit: 203feeed86b3ef82a4d4e4ff4a85d79acd2038ae
Component: engine
 2017-05-15 12:45:13 -07:00
John Stephens 37a6b2b6e0 Fix make.ps1 client build for Windows 
Always clone the client to the docker directory, even if the specified
client repository is a fork. This is simpler than modifying the build
command to specify the package path of the fork.

Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: 632a8635a0fa0b09759f87fc8a024d99a984c9df
Component: engine
 2017-05-15 12:38:10 -07:00
Kenfe-Mickael Laventure e9a2524de1 Add missing go-difflib vendoring 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 8c340b7edfa042d67ad766152ae61ef03e54793d
Component: engine
 2017-05-15 11:23:52 -07:00
Brian Goff 9322a3476f Merge pull request #33200 from thaJeztah/remove-unused-key-file 
Remove unused launchpad key file
Upstream-commit: 55ed80f78abcc7204a6e269d59f4d4bda2f3c5c5
Component: engine
 2017-05-15 14:19:19 -04:00
Kenfe-Mickael Laventure 76789457c2 Use containerd Status variable when checking container state 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 0ea0b2becf119ca7950e8afcf5d440e800484b15
Component: engine
 2017-05-15 10:53:51 -07:00
Deng Guangxing b04f3cd16c fix inconsistent state string with containerd 
should be `stopped` according to containerd:
  https://github.com/containerd/containerd/blob/v0.2.x/runtime/runtime.go#L104

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 9771780a01e73200f96c84aa83689b7f34092772
Component: engine
 2017-05-15 10:53:51 -07:00
Brian Goff 8a368b7357 Merge pull request #33119 from nhorman/devmapper-fixes 
Devmapper fixes for cookie generation and error reporting (fixes  #33050)
Upstream-commit: 2c45392b8fe134ef9689488d7e9e00ef711f9ee4
Component: engine
 2017-05-15 13:18:52 -04:00
Tonis Tiigi 54b5650fc8 docs: add missing cache-from man docs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 33054be31bd78422b09a3789c99d7aa5d488e61b
Component: engine
 2017-05-15 09:58:49 -07:00
Tonis Tiigi 2850502ebe docs: add docs for build —target 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3377664e947979d2609135761a3c559fe47ef758
Component: engine
 2017-05-15 09:56:53 -07:00
Kenfe-Mickaël Laventure 04ea6ad3f6 Merge pull request #32502 from tonistiigi/git-allow-pr-number 
Allow specifying any remote ref in git checkout URLs
Upstream-commit: ba52bb0fd158dcd99ff65d0a422add8ecde01b3e
Component: engine
 2017-05-15 09:34:54 -07:00
Abhishek Sharma 6870cd926f Adding a README.md for the hack folder. 
Signed-off-by: Abhishek Sharma <abhishek@asharma.me>
Upstream-commit: 99c1456647d23e7ca39d0af1742db5bacb87df40
Component: engine
 2017-05-15 17:06:35 +02:00
Akihiro Suda 0b10be446f integration-cli-on-swarm/README.md: add a note about Docker->Moby 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 63d4000e97bc0bee706e0831c5b5015ea448e3ae
Component: engine
 2017-05-15 14:37:05 +00:00
Sebastiaan van Stijn fe83ce5181 Merge pull request #33170 from aaronlehmann/vendor-swarmkit-1ede4f8 
Vendor swarmkit ae29cf2
Upstream-commit: 4d8234fb102d90717db7d4b978671a5fe6cd5eab
Component: engine
 2017-05-15 16:16:46 +02:00
Sebastiaan van Stijn 5ebfd27acb Merge pull request #32821 from cpuguy83/32613_fix_volspec_backport 
Fix issue backporting mount spec to pre-1.13 obj
Upstream-commit: 6cea2e5206f455d345df98f4a2e4abe8c803ab5a
Component: engine
 2017-05-15 15:58:31 +02:00
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
Sebastiaan van Stijn 15c0f868cb Remove unused launchpad key file 
Commit d841da9379c7d08408c55bfa5d24276826362b23 removed
the dependency on libzfs-dev from the Dockerfile.

This key file was only used for the PPA used to
install libzfs-dev, and is now no longer
needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3b9a6309c8f858f869a6392b6a0a7166b52b363e
Component: engine
 2017-05-15 15:51:18 +02: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
Vincent Demeester 9b335b3a77 Remove unused opts (moved to docker/cli) 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 306074572ca3025820a4a3ad98e327dd51edaf47
Component: engine
 2017-05-15 14:38:58 +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
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
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
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 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
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