ed052d78fd
pluggable secret backend
...
This commit extends SwarmKit secret management with pluggable secret
backends support.
Updating the work in
[swarmkit](docker/swarmkit@eebac27434 ) for
pluggable secret backend and adding the
driver parameter to `SecretSpec`.
Remaining work:
- [ ] CLI support (docker/cli)
- [ ] api in [plugin helpers](docker/go-plugins-helpers))
- [ ] Reference plugin
- [ ] Documenation (after cli work)
Signed-off-by: Liron Levin <liron@twistlock.com >
Upstream-commit: 7d45cafd5746e847e58078aa2fbdde57b5f49fa4
Component: engine
2017-07-15 16:50:02 +03:00
4f75fb4d4c
bump image-spec to 372ad780f63454fbbbbcc7cf80e5b90245c13e13
...
this commit matches what's used in SwarmKit
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9fc66ec869ecd963d7a30b96f5c0b1de69cf5090
Component: engine
2017-07-11 20:52:17 -07:00
57481ff30b
Re-vendor swarmkit. This includes the following fixes:
...
- https://github.com/docker/swarmkit/pull/2266 (support for templating Node.Hostname in docker executor)
- https://github.com/docker/swarmkit/pull/2281 (change restore action on objects to be update, not delete/create)
- https://github.com/docker/swarmkit/pull/2285 (extend watch queue with timeout and size limit)
- https://github.com/docker/swarmkit/pull/2253 (version-aware failure tracking in the scheduler)
- https://github.com/docker/swarmkit/pull/2275 (update containerd and port executor to container client library)
- https://github.com/docker/swarmkit/pull/2292 (rename some generic resources)
- https://github.com/docker/swarmkit/pull/2300 (limit the size of the external CA response)
- https://github.com/docker/swarmkit/pull/2301 (delete global tasks when the node running them is deleted)
Minor cleanups, dependency bumps, and vendoring:
- https://github.com/docker/swarmkit/pull/2271
- https://github.com/docker/swarmkit/pull/2279
- https://github.com/docker/swarmkit/pull/2283
- https://github.com/docker/swarmkit/pull/2282
- https://github.com/docker/swarmkit/pull/2274
- https://github.com/docker/swarmkit/pull/2296 (dependency bump of etcd, go-winio)
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 4509a001dffff626d2d8708fd2eb1c6317b201f3
Component: engine
2017-07-11 13:43:43 -07:00
30a181615a
Bump vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587
...
This bumps vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587
and revendors dependencies.
Includes a change that prunes go files with `+build ignore`
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 63f4bc5237dc928125ac62aa5468f6d8b28272c7
Component: engine
2017-07-10 14:05:13 -07:00
db491388be
Merge pull request #33996 from thaJeztah/un-fork-etcd
...
Un-fork coreos/etcd - bump to v3.2.1
Upstream-commit: 0ea804c2405f42ecd8e1834d329fa45f326bf175
Component: engine
2017-07-10 09:14:22 -07:00
dd3dcdbd0d
vendor: add go-semver
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 733f672100a436b272ea871c4ba427f07d7bfa8a
Component: engine
2017-07-07 16:42:14 -07:00
eb145cf9d7
Revendor jhowardmsft/opengcs v0.0.9
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7643e8909675fb7b1d52a8c7566fb674db340a39
Component: engine
2017-07-06 14:29:43 -07:00
f6e262f402
Un-fork coreos/etcd - bump to v3.2.1
...
Commit 077f08bf54dc89d382cbcbd797b2bd7c4867151d
temporarily switch etcd to a fork, pending a
pull-request to be merged, and a new release
that contains the change.
The pull request was merged, and included in
etcd v3.2.0
This patch bumps etcd to v3.2.1, which contains
some bug-fixes on top of v3.2.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: cbc480a40cb22653ac647a8d24957a0c33e3bffe
Component: engine
2017-07-06 13:58:13 -07:00
1c03f9a249
Vendor github.com/jhowardmsft/opengcs v0.0.7
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3f14e25a7f67e0236dfdcde792ac571ca7874c47
Component: engine
2017-06-26 21:24:39 -07:00
3172848991
Update go-connections dependency
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 497e6e0caaf805f8693c35cb45edbc8f734f09f2
Component: engine
2017-06-24 12:40:49 +02:00
553c4b8a9b
Merge pull request #33785 from Microsoft/jjh/hcsschemaupdate
...
LCOW: Updates necessary due to platform schema change
Upstream-commit: 25a65a185b6b512117803ab25c716ca8f831ccdf
Component: engine
2017-06-23 13:08:13 -07:00
38ce10a9ac
Vendor jhowardmsft/opengcs v0.0.4
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c75db46d5b4faae326793b7c6c5fc35be39fca7d
Component: engine
2017-06-22 19:28:49 -07:00
35bda9cb09
Vendor Microsoft/hcsshim v0.5.25
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9508c605d882a5981a480ab0a07cc9b77568b4d8
Component: engine
2017-06-22 19:28:43 -07:00
1ff0d7b31f
Merge pull request #33738 from fcrisciani/libnetwork-vendoring
...
Libnetwork vendoring
Upstream-commit: 9f5f3e49dae981736b37bf3d18592c2ce4029644
Component: engine
2017-06-22 17:41:46 -07:00
f565ab7c75
Merge pull request #33773 from aaronlehmann/vendor-swarmkit-79381d0
...
Vendor swarmkit 79381d0
Upstream-commit: 4d0c01ac17933ee0c8b94bc2beea5965377d42ef
Component: engine
2017-06-22 16:26:34 -07:00
0051caf8c8
vendor: update deps for fssession
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 7cfcf74a907bb1fce63e95761c7e1ac70cb9e5df
Component: engine
2017-06-22 11:22:42 -07:00
0ae69f3fe0
Merge pull request #33750 from dnephin/cleanup-more-cli-leftovers
...
Cleanup more cli leftovers
Upstream-commit: 4bdb6ed9b58d641176a601cfe92d496038c5a557
Component: engine
2017-06-21 21:23:28 -07:00
61e4b54502
Vendor swarmkit 79381d0
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 79b940feee9cf18893ead7269cfd59ec41bd7297
Component: engine
2017-06-21 15:32:53 -07:00
e9c808203d
Remove miekg/pkcs11 from vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4e5293c253c4803de75c77cc9cee024d95303d6a
Component: engine
2017-06-21 11:18:44 -04:00
3ad2759bd3
Vendor jhowardmsft/opengcs v0.0.3
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 07034a4420c9bd1cb964f18c0128a215ab17d5a8
Component: engine
2017-06-20 19:49:56 -07:00
1a43aff22a
Vendor Microsoft/hcsshim @ v0.5.2
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8fe9eb0551aa02eeacf1a27d5cf5adeb0c2bacac
Component: engine
2017-06-20 19:49:55 -07:00
ea569af511
Libnetwork vendoring
...
Fixes in the Service Discovery areas
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: e1953f1ca717c2609a0ee801c8af5b874d9fc3d2
Component: engine
2017-06-19 19:42:24 -07:00
7d5222b592
vendor: remove unused package
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 932759c288ef3055919388bc0319cddde0bee34a
Component: engine
2017-06-15 13:23:11 -07:00
f104371302
Vendor swarmkit a4bf013
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 32d7b0f3601258edf94ecf0e2e9018a406846888
Component: engine
2017-06-12 10:31:11 -07:00
3f80d858fd
Vendoring libnetwork f4a15a0890383619ad797b3bd2481cc6f46a978d
...
Contains Service Discovery hardening fixes via
https://github.com/docker/libnetwork/pull/1796
Fixes multiple issues such as #32830
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 6868b8ef230fea7bc5758e2d252d4297033029fa
Component: engine
2017-06-12 01:01:45 -07:00
6eb59ca44c
Update grpc to v1.3.0 and bump protobuf bindings.
...
and update some dependent packages.
We would like to keep moby/moby and swarmkit somewhat in sync here and
https://github.com/docker/swarmkit/pull/2229 proposes a similar bump to
swarmkit, needed due to https://github.com/docker/swarmkit/pull/1965 which
pulls in containerd which uses some newer features of the grpc package.
Signed-off-by: Ian Campbell <ian.campbell@docker.com >
Upstream-commit: 379557a95873aad26b7eb20a7a48f8e1e7551041
Component: engine
2017-06-08 14:34:23 +01:00
af043a1e5b
Vendoring libnetwork and netlink
...
libnetwork eb57059e91bc54c9da23c5a633b75b3faf910a68
netlink bd6d5de5ccef2d66b0a26177928d0d8895d7f969
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 5fd65a6b6c524e670f3b4ccced3974f63c1fd9a6
Component: engine
2017-06-07 06:20:27 -07:00
e930dafbb3
Vendoring libnetwork 2e99f06621c23a5f4038968f1af1e28c84e4104e
...
Fixes #33415
Fixes #33346
Implemented few additional IPVS APIs to be used by other projects
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 0484bdb6ca0ddd0bebc490e335a7f788cdc30f13
Component: engine
2017-05-31 16:04:00 -07:00
9b30256194
Merge pull request #33360 from aaronlehmann/vendor-swarmkit-7e096ced
...
Vendor swarmkit 7e096ced
Upstream-commit: 6629f1d0e753edc960f30030299e0e5d48b845aa
Component: engine
2017-05-30 09:59:48 -07:00
05027a4b96
Update go-winio to v0.4.2
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 3f13107223a9753d709c196c46f1c846041fc0c3
Component: engine
2017-05-23 18:27:50 -07:00
5556f64d13
Vendor swarmkit 7e096ced
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 10df99f9ae48acc9888494223256637a8ca06f50
Component: engine
2017-05-23 15:01:35 -07:00
949950950a
vendor: Remove docker-credential-helpers
...
This appears to be a remnant from the CLI that is no longer imported
anywhere. Remove it from vendor.conf and the vendor directory.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: aa6fc939baf0bae00391a0ba703187018055b8bf
Component: engine
2017-05-22 13:58:28 -07:00
7813ee64ef
Merge pull request #33310 from darrenstahlmsft/RevendorGowinio
...
Revendor go-winio to v0.4.1
Upstream-commit: 65f360fc415a5ef648250a76ca261c2ae529467a
Component: engine
2017-05-22 10:31:57 -07:00
bce5af578c
Revendor go-winio to v0.4.1
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: af7d8d09ef2dde07c9c0004a14e3a28c93007458
Component: engine
2017-05-19 16:13:52 -07:00
1f14cbbc58
Revendor runtime-spec
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: b90f294c1cf0dd2bc3f139cd8f339da79595a0bb
Component: engine
2017-05-19 12:33:14 -07:00
f6ecbd87c6
Vendoring libnetwork
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 9b0e1df4dd2dbab6d2aacfaae0ea27deaf5c7c62
Component: engine
2017-05-18 15:14:12 -07:00
4f144ce76f
swarmkit vendoring
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com >
Upstream-commit: f3d8ff774e77c44f5b13474f74602ff772eb2f40
Component: engine
2017-05-17 18:46:34 -07:00
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
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
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
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
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
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
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
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
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
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
c8c0bf9d2e
Merge pull request #33100 from fcrisciani/memberlist_version
...
Libnetwork vendoring
Upstream-commit: 2ca41c47c4a0e430267f960836ab182964557fdb
Component: engine
2017-05-10 21:09:38 -07:00
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
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
