bb1c0c5aa8
Merge pull request #34846 from Microsoft/jjh/debuggcs
...
LCOW: Add UVM debugability by grabbing logs before tear-down
Upstream-commit: 7cbbbb95097f065757d38bcccdb1bbef81d10ddb
Component: engine
2017-09-19 22:33:46 +02:00
ddb0ee3757
Revendor Microsoft/opengcs @ v0.3.4
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2798576b37aa99643a06366f00072b6026c0b77e
Component: engine
2017-09-19 09:56:23 -07:00
7ac80a2691
Merge pull request #34674 from pradipd/windows_routingmesh
...
Enabling ILB/ELB on windows using per-node, per-network LB endpoint.
Upstream-commit: a2ee40b98c281139c75b38e0e11aa35726021169
Component: engine
2017-09-18 15:56:17 -07:00
b8677707a9
vendoring libnetwork and swarmkit
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: 4c1b07924a7449e6e37fac4479624fcaf01ce889
Component: engine
2017-09-18 20:38:18 +00:00
cddfe04f6a
LCOW: Implemented support for docker cp + build
...
This enables docker cp and ADD/COPY docker build support for LCOW.
Originally, the graphdriver.Get() interface returned a local path
to the container root filesystem. This does not work for LCOW, so
the Get() method now returns an interface that LCOW implements to
support copying to and from the container.
Signed-off-by: Akash Gupta <akagup@microsoft.com >
Upstream-commit: 7a7357dae1bcccb17e9b2d4c7c8f5c025fce56ca
Component: engine
2017-09-14 12:07:52 -07:00
14427ba493
Vendor containerd/continuity@22694c680e
...
Signed-off-by: Akash Gupta <akagup@microsoft.com >
Upstream-commit: ba13c173d1704168b918705b827963dc6e3900ab
Component: engine
2017-09-14 12:00:38 -07:00
97847089f1
revendor logrus and x/crypto
...
this fixes the issue that was blocking a test from running on ppc64le.
the logrus revendor changes the color code used in that same test, so
that breaks the test for all platforms (updated in this pr)
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: 008b217844f8738cc47ef9ff108dc41dc37736cc
Component: engine
2017-09-14 11:05:47 -05:00
99b37c7406
Update hcsshim to v0.6.5
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: bffc7a423f20730f086c30bc189d6c6ad81d16dd
Component: engine
2017-09-12 18:46:12 -07:00
1d65628454
Merge pull request #34754 from Microsoft/jjh/read-only
...
LCOW: VHDX boot to readonly.
Upstream-commit: 969b76d85f93e214cbc44f25a3f44b67cb0dc078
Component: engine
2017-09-12 08:35:21 -07:00
810209d155
Revendor Microsoft/hcsshim @ v0.6.4
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e47c626e0a5e7285782620c027b3d5195c643a5a
Component: engine
2017-09-07 12:08:40 -07:00
c87a482794
Revendor Microsoft/opengcs @v0.3.3
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bf898b7a0cedfec5b7e8104a1ac684f9dd232638
Component: engine
2017-09-06 12:55:25 -07:00
35c8905315
Vendoring libnetwork
...
Diff:
5b28c0ec98...d5c8223190flavio.crisciani@docker.com >
Upstream-commit: 1ddeb11835600127a3319fc0dd3764e57ffbf521
Component: engine
2017-08-31 19:10:23 -07:00
17038054a4
Merge pull request #34667 from dnephin/add-container-config-decode-tests
...
Add container config decode tests
Upstream-commit: e95585f7b0c1ad93dee0fb5cbd8a5c387053f140
Component: engine
2017-08-30 07:25:27 -07:00
79507cd3e5
Add gotestyourself/skip
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 385727588ed68dafb7d18906d7b15260b52778e8
Component: engine
2017-08-29 14:35:12 -04:00
55ca4eff51
Merge pull request #33684 from dnephin/update-service-ps-tests
...
Update service ps to be an API test
Upstream-commit: 15b8d0420b57776028875dbf89fc6d9dbb0666e2
Component: engine
2017-08-29 09:44:20 +02:00
ae8028a8f8
Merge pull request #34331 from twistlock/plugable_secrets_backend
...
[WIP] update swarmkit dependecies to support plugable secrets
Upstream-commit: 964ba0eaa83ac44e614c7ca68fbe2d92c5435a8c
Component: engine
2017-08-28 10:31:27 -04:00
29f6815811
Add gotestyourself to vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 381a1c0a5ac99b6d7ab33a29150878b9a8008e95
Component: engine
2017-08-25 17:24:25 -04:00
be2aa448d0
Add gotestyourself to vendor
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0a7ff351b76f369b1cb1bc741e54b0d9018e7410
Component: engine
2017-08-25 12:06:25 -04:00
9f8c4fc433
Merge pull request #34614 from dnephin/remove-pkg-testutil-tempfile
...
Remove pkg testutil tempfile
Upstream-commit: ff6fbe224f8b490b05f8489e5ae3219126d8017b
Component: engine
2017-08-24 15:24:15 -07:00
332ff8ee6f
Add gotestyourself to vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 47962ee32ff785eb179de4a706e557b66e8b1841
Component: engine
2017-08-23 17:13:27 -04:00
5305a1cd9e
Update containerd to 06b9cb35161009dcb7123345749fef02f7cea8e0
...
This also update:
- runc to 3f2f8b84a77f73d38244dd690525642a72156c64
- runtime-specs to v1.0.0
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 45d85c99139bbd16004bbedb7d5bac6a60264538
Component: engine
2017-08-21 12:04:07 -07:00
3fa5ba0a1e
plugable secret backend - update vendor.conf
...
Updating swarmkit dependencies.
Add more parameters for the secret driver API.
Signed-off-by: Liron Levin <liron@twistlock.com >
Upstream-commit: 3b8d36d0646137c4315cfa12df0dcd49b584d22a
Component: engine
2017-08-18 21:52:26 +03:00
2170bca7b5
Libnetwork vendoring
...
- lock OS thread in overlay driver operation
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 85706876471400716f2b37ca0a0bbd75128fc412
Component: engine
2017-08-16 09:48:12 -07:00
e80c7b1a0c
Merge pull request #34504 from fcrisciani/ln-vendoring
...
Libnetwork vendoring
Upstream-commit: 036314622de7cfc62b5f9a88c849faf17c9bc1d3
Component: engine
2017-08-15 08:06:26 -07:00
4233bbe278
Libnetwork vendoring
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 167564a798365d9924260e721954b7ca43322726
Component: engine
2017-08-14 09:31:23 -07:00
5963ab8f5e
Merge pull request #34378 from fcrisciani/ln-vendoring
...
Vendoring libnetwork
Upstream-commit: aaee3ca6c1129f62eaa64a76a3f770ae09d04d09
Component: engine
2017-08-10 17:07:14 -07:00
848a1fd437
Vendoring libnetwork
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 709a433ec827b034b798e748d4393f7c9f3b3bc0
Component: engine
2017-08-10 08:51:30 -07:00
94b4666b88
Revendor Microsoft/go-winio @ v0.4.5
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 779469d9c98b83d54bc45f808de76c2088ffe8c7
Component: engine
2017-08-09 08:31:43 -07:00
5a28415680
Merge pull request #34449 from Microsoft/jjh/hcsshim0.6.3
...
Revendor Microsoft/hcsshim @V0.6.3
Upstream-commit: 5c49240c94783a3ecb3881890725136d8d743dea
Component: engine
2017-08-09 07:21:49 -07:00
df85fb5a80
Vendor Microsoft/opengcs @ v0.3.2
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5463c582172e04132ecf48fad00cc90c8e233386
Component: engine
2017-08-08 15:43:43 -07:00
d433044d76
Revendor Microsoft/hcsshim @V0.6.3
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3e71acf0fc485cccc9feda57ea53a69377179321
Component: engine
2017-08-08 14:08:03 -07:00
c9e85143b7
Revendor Microsoft/hcsshim @ v0.6.2
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 809fed5fa6c54befe45b90b25c961e2f84674419
Component: engine
2017-08-03 16:29:25 -07:00
6183428a5c
Merge pull request #34170 from Microsoft/jjh/sandbox
...
LCOW: Dynamic sandbox management
Upstream-commit: a3ffc42b13063e59dbf7d52a56f8806ac71160eb
Component: engine
2017-08-03 16:07:40 -07:00
42c8c64090
Revendor jhowardmsft/opengcs @ v0.0.12
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 0bd1cf25175c19e7fffc70b31cd7565bc432df19
Component: engine
2017-08-03 09:06:45 -07:00
296e1bef94
Revendor microsoft/go-winio @ v0.4.4
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 45e2dd123bd9ace93d3fa85b12fcea3a8ac642ce
Component: engine
2017-08-03 09:06:26 -07:00
89bd931ee6
Merge pull request #34360 from FengtuWang/arm64_testcase
...
fix TestLogsFollowGoroutinesWithStdout in arm64
Upstream-commit: f577caff19d486d8d01443507d891cb1b0891cdc
Component: engine
2017-08-02 16:56:20 +02:00
37dd8712ef
fix TestLogsFollowGoroutinesWithStdout in arm64
...
Test case TestLogsFollowGoroutinesWithStdout failed in
arm64 because gopkg.in/fsnotify.v1 does not support
arm64 until version v1.3.0. Update fsnotify to latest
version v1.4.2 to support arm64.
see issue https://github.com/fsnotify/fsnotify/issues/112
Signed-off-by: Fengtu Wang <wangfengtu@huawei.com >
Upstream-commit: 6e590d3b99f9f225feecaabbd035089de67ecd2a
Component: engine
2017-08-02 10:08:00 +08:00
ed4f0879cf
Update imports for logrus version
...
Add forks for changes which only make logrus change without functional
change.
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: 4f3616fb1c112e206b88cb7a9922bf49067a7756
Component: engine
2017-07-31 13:19:38 -07:00
d659edcaf5
Update logrus to v1.0.1
...
Fixes case sensitivity issue
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: 1009e6a40b295187e038b67e184e9c0384d95538
Component: engine
2017-07-31 13:16:46 -07:00
d027c213aa
Merge pull request #34304 from tiborvass/use-buildkit-session
...
Use buildkit session package
Upstream-commit: 1375d893e9fb2213df8dbb4d375a220e9b009025
Component: engine
2017-07-31 11:16:27 -07:00
e49d00a362
vendor github.com/moby/buildkit/session
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 5898a364639eab476441dfd2b135beb1e5e331cd
Component: engine
2017-07-28 16:34:24 -07:00
2dcbbd9e01
Libnetwork vendoring
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 68d8198ed07acde9146a3e8e2021bd9d57250d81
Component: engine
2017-07-28 13:51:54 -07:00
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
