toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,774 Commits 3 Branches 295 Tags
dbe03d4016b1699d0076bea100c98bc65e0e58f6
Commit Graph

230 Commits

Author SHA1 Message Date
Andrew Hsu
fb319d1554 Merge pull request #114 from cyli/re-vendor-swarmkit 
[17.06] backport (swarmkit) cluster update and memory issue fixes
 2017-07-12 17:34:49 -07:00
Andrew Hsu
136b90fbd0 Merge pull request #102 from tiborvass/runtime-spec-fix 
[17.06][engine][vendor] forks of containerd + runc + runtime-spec
 2017-07-12 15:29:33 -07:00
Ying
9241ec7a1e Bump swarmkit vendor in order to include the following changes: 
- https://github.com/docker/swarmkit/pull/2281 - fixes an issue where some cluster updates
  could be missed if a manager receives a catch-up snapshot from another manager
- https://github.com/docker/swarmkit/pull/2300 - fixes a possible memory issue if an
  external CA sends an overlarge response

Signed-off-by: Ying <ying.li@docker.com>
 2017-07-12 14:50:21 -07:00
Tibor Vass
2206628703 [engine][vendor] forks of containerd + runc + runtime-spec 
This vendors from the docker org:
- containerd to 6e23458c129b551d5c9871e5174f6b1b7f6d1170
- runc to 810190ceaa507aa2727d7ae6f4790c76ec150bd2
- runtime-spec to a45ba0989fc26c695fe166a49c45bb8b7618ab36

This fixes two issues:
- if the container is paused, it now responds properly to SIGKILL
- on buggy kernels such as RHEL7.2, a int64->uint64 conversion bug
  prevented containers to start when memory cgroup was specified.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-07-12 03:13:56 +00:00
Andrew Hsu
4ff90f5cb1 vndr to update vendor for github.com/spf13/cobra 
No changes to vendor.conf, just running vndr.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-11 07:43:45 +00:00
Andrew Hsu
af26684564 vndr to update vendor for github.com/Microsoft/go-winio 
No changes to vendor.conf, just running vndr.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-11 07:41:38 +00:00
Andrew Hsu
77c3cf33ae Merge pull request #85 from tiborvass/libnetwork-rc5 
[engine] Vendor libnetwork to 20bf4e23da1bb3f9d3dc70e4cf531b84c45947bd
 2017-06-19 20:56:21 -07:00
Tibor Vass
5578ebd2a2 [engine] Vendor libnetwork to 20bf4e23da1bb3f9d3dc70e4cf531b84c45947bd 
Brings in this pull request:
- https://github.com/docker/libnetwork/pull/1808

Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-06-20 02:40:33 +00:00
Tibor Vass
073d80bc46 [engine] Vendor swarmkit to 9edb625cfb4407da456cc7fc479db6d824fe81f3 
Brings in these pull requests:
- https://github.com/docker/swarmkit/pull/2224
- https://github.com/docker/swarmkit/pull/2268
- https://github.com/docker/swarmkit/pull/2263

Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-06-20 01:48:19 +00:00
Aaron Lehmann
f2eb8b825b Vendor swarmkit bf9b892 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-06-13 11:37:41 -07:00
Andrew Hsu
d611e35db6 Merge pull request #69 from andrewhsu/sk 
revendor github.com/docker/swarmkit to ef3c57a
 2017-06-12 22:03:36 -07:00
Andrew Hsu
a16a6004a8 revendor github.com/docker/swarmkit to 6083c76 
To get the changes:
* https://github.com/docker/swarmkit/pull/2234
* https://github.com/docker/swarmkit/pull/2237
* https://github.com/docker/swarmkit/pull/2238

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-13 00:04:15 +00:00
Madhu Venugopal
8ef3d608d9 Vendoring libnetwork 4f5310be349d9299f6cab6d5822312f00cfa965c 
This is a cherry-pick of https://github.com/moby/moby/pull/33634
that brings in https://github.com/docker/libnetwork/pull/1796.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-06-12 09:04:36 -07:00
Andrew Hsu
514d89f021 Merge pull request #55 from andrewhsu/revendor-libnetwork-netlink 
revendor libnetwork and netlink in engine component
 2017-06-11 10:32:17 -07:00
Andrew Hsu
a9a1a9c7de Merge pull request #43 from cyli/re-vendor-swarmkit 
[17.06] Re-vendor swarmkit
 2017-06-09 17:32:55 -07:00
Andrew Hsu
be7a008421 revendoring netlink in engine component 
bumping vendor of vishvananda/netlink to bd6d5de5ccef2d66b0a26177928d0d8895d7f969

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-09 21:37:15 +00:00
Andrew Hsu
fcd821892e revendoring libnetwork in engine component 
bumping vendor of docker/libnetwork to 411846172fb457a6459ea94eb536f91717ee0a04

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-09 21:27:44 +00:00
Ying
11637f7d81 Re-vendor swarmkit to include the following fixes: 
- https://github.com/docker/swarmkit/pull/2218
- https://github.com/docker/swarmkit/pull/2215
- https://github.com/docker/swarmkit/pull/2233

Signed-off-by: Ying <ying.li@docker.com>
 2017-06-09 13:25:15 -07:00
Kenfe-Mickael Laventure
765e46f7cc Update containerd to cfb82a876ecc11b5ca0977d1733adbe58599088a 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-09 09:33:50 -04:00
Andrew Hsu
ce44edfbf8 Merge pull request #19 from aluzzardi/revendor-swarmkit 
[17.06] Re-vendor SwarmKit to 4b872cfac8ffc0cc7fff434902cc05dbc7612da5
 2017-06-06 00:37:05 -07:00
Andrea Luzzardi
0efdcc403e Re-vendor SwarmKit to 4b872cfac8ffc0cc7fff434902cc05dbc7612da5 
Includes:
- docker/swarmkit#2203
- docker/swarmkit#2210
- docker/swarmkit#2212

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-06-06 05:55:35 +00:00
Andrew Hsu
8cf591e57d Merge pull request #21 from mavenugo/17.06 
Vendoring libnetwork b54433f6459b84eae77892d0d359c1bafb133529
 2017-06-05 22:25:27 -07:00
Madhu Venugopal
699fcc1433 Vendoring libnetwork 
This is a 17.06 equivalent cherry-pick of
https://github.com/moby/moby/pull/33463

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 03:18:59 +00:00
Darren Stahl
4360062d33 Update go-winio to v0.4.2 
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit 3f13107223a9753d709c196c46f1c846041fc0c3)
 2017-05-31 10:39:35 -07:00
Madhu Venugopal
f6ecbd87c6 Vendoring libnetwork 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 9b0e1df4dd2dbab6d2aacfaae0ea27deaf5c7c62
Component: engine
 2017-05-18 15:14:12 -07:00
Abhinandan Prativadi
4f144ce76f swarmkit vendoring 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: f3d8ff774e77c44f5b13474f74602ff772eb2f40
Component: engine
 2017-05-17 18:46:34 -07:00
Alessandro Boch
a5f77dbdd1 Vendor gogoprotobuf v0.4 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 3950cef94111ccd7d15091059e562960554900fc
Component: engine
 2017-05-17 15:50:28 -07:00
Alessandro Boch
a66a7ebd10 Vendor swarmkit @998a47f 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 8daeeacfc1126eafb2b6d00e2dc6e2f5a6ed78cc
Component: engine
 2017-05-17 15:50:28 -07:00
Alessandro Boch
73e3c52c67 Vendoring libnetwork @b2bc1a6 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 46392f2442137ad52bb7382e91e7ad4b70d323b9
Component: engine
 2017-05-17 15:50:28 -07:00
Brian Goff
f81cca9824 Merge pull request #33075 from x1022as/stop 
fix inconsistent state string with containerd
Upstream-commit: 4dd3e5b77c2f5ab8203cb8fc239e8441a504d799
Component: engine
 2017-05-17 09:27:47 -04:00
Aaron Lehmann
a57be1e4d4 api: Use OCI types for Digest and Platform 
The current use of the types from distribution brings in some
unfortunate dependencies, including other distribution packages and the
gorilla/mux and gorilla/context packages. Using the OCI types avoids
the extra dependencies for client users.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 309f99edae5849327ab9c3ec9335b42ba5612202
Component: engine
 2017-05-16 14:54:23 -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
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
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
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
Madhu Venugopal
c8c0bf9d2e Merge pull request #33100 from fcrisciani/memberlist_version 
Libnetwork vendoring
Upstream-commit: 2ca41c47c4a0e430267f960836ab182964557fdb
Component: engine
 2017-05-10 21:09:38 -07:00
Darren Stahl
d781af028f Update go-winio to v0.4.0 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 24d41778595722d2d318eba45d9e723aaa918b20
Component: engine
 2017-05-09 17:49:55 -07:00
Flavio Crisciani
6f58dd156b Libnetwork vendoring 
Fixes backward compatibility for memberlist

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: 7ff9fb5f04e730b3de552746a800d7c1fcf06c48
Component: engine
 2017-05-09 13:41:54 -07:00
John Howard
cce43bed79 Revendor Microsoft\hcsshim @ v0.5.17 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1bb3f57c45274e48f675a4548adc030deedda74c
Component: engine
 2017-05-09 11:44:14 -07:00
Brian Goff
600b71450c Re-run vndr 
Now that the CLI is gone there are lots of packages that need to be
pruned from vendor.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5122abeb4416c742255cb85d364d7d25d7f5ce32
Component: engine
 2017-05-09 10:59:25 -04:00
Tibor Vass
cf964b3db2 Merge pull request #33059 from nishanttotla/vendor-swarmkit 
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
Upstream-commit: 4b846a125b1618e19b389bcdf88b57bef0a05817
Component: engine
 2017-05-08 14:27:51 -07:00
Kenfe-Mickaël Laventure
53d1a4eb83 Merge pull request #33007 from crosbymichael/containerd-rc5 
Update moby to containerd and runc 1.0 final rc
Upstream-commit: 7238cca42c3d024adfa030306ad3e3ec4232baed
Component: engine
 2017-05-08 09:23:07 -07:00
Nishant Totla
4356b71651 Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 1b68641fc8fe0767aba510ec04fdc1dd221e5d0c
Component: engine
 2017-05-05 14:18:12 -07:00
Michael Crosby
ce61a3d4f2 Update moby to runc and oci 1.0 runtime final rc 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 005506d36c1c9308a05592d7596f3d484359c426
Component: engine
 2017-05-05 13:45:45 -07:00
Brian Goff
9f15ce38af Merge pull request #29554 from cpuguy83/keep_running_count_of_states 
Use counter for tracking container states
Upstream-commit: 669f4ba37ef6eb5419306e6af4f6efdce92501a0
Component: engine
 2017-05-05 16:15:22 -04:00
Aaron Lehmann
f8ce0097a0 Vendor swarmkit 8f053c2 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 077f08bf54dc89d382cbcbd797b2bd7c4867151d
Component: engine
 2017-05-02 15:51:26 -07:00
Ian Campbell
8fded72012 Update to latest vndr c56e08229111 
Changes are:

$ git log --no-merges --oneline 19220953c4a4..c56e08229111
4b76270 Keep "vendor.conf" for reference
ac8f766 travis: update to go 1.8.1
c196644 Better validation of duplicates
e684d5e check for unused packages at the end
3ed2513 detect default gopath($HOME/go)
c9052f3 fix backtick in readme
0e04f23 Missing installation section in README

Changes to moby are the inclusion of several upstream vendor.conf files and
switching to vendoring the toplevel golang.org/x/sync package rather than the
syncmap sub-package due to:

2017/05/02 11:21:06 WARNING: package golang.org/x/sync/syncmap is not root import, should be golang.org/x/sync

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: a28d91349edda7e4e4ecaa5b1e60a238fe515a4d
Component: engine
 2017-05-02 11:23:36 +01:00
Brian Goff
9fdc574804 Use counter for tracking container states 
Container state counts are used for reporting in the `/info` endpoint.
Currently when `/info` is called, each container is iterated over and
the containers 'StateString()' is called. This is not very efficient
with lots of containers, and is also racey since `StateString()` is not
using a mutex and the mutex is not otherwise locked.

We could just lock the container mutex, but this is proven to be
problematic since there are frequent deadlock scenarios and we should
always have the `/info` endpoint available since this endpoint is used
to get general information about the docker host.

Really, these metrics on `/info` should be deprecated. But until then,
we can just keep a running tally in memory for each of the reported
states.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e4c03623c2fcd3013343d246e3432409850c8c37
Component: engine
 2017-04-29 17:10:14 -04:00
Vincent Demeester
79f9dd11cc Merge pull request #32687 from runcom/oci-selinux 
Switch to using opencontainers/selinux for selinux bindings
Upstream-commit: 4219156a6254bdc7d270f06742037df8e2708a9a
Component: engine
 2017-04-29 19:05:32 +02:00