Commit Graph

24 Commits

Author SHA1 Message Date
214de28cc7 Vendoring swarmkit @b74ec2b
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 747f0b4ba52b25a4ede0d54cb1674f221ea3e2ed
Component: engine
2017-03-30 16:12:33 -07:00
9345697f56 vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: aac861f3d9d0a38d9bcc4e11d56ef9648bb1f79e
Component: engine
2017-03-28 11:51:33 -07:00
c2f1681e6f Vendoring swarmkit @9fdea50
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 434e9695e42f9399c627d433972dbd73f7c8502f
Component: engine
2017-03-24 11:07:33 -07:00
e454be5cbf Merge pull request #31535 from aaronlehmann/vendor-swarmkit-7fc7503
Vendor swarmkit d60ccf3
Upstream-commit: 3fe2730ab3d7bba483d7bf4fb1e95b627823ff4d
Component: engine
2017-03-08 09:52:28 -08:00
9b41265701 Vendor swarmkit d60ccf3
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 39433318fe224e9066a892fc5834b38649ec86ac
Component: engine
2017-03-07 19:09:21 -08:00
3442ecd596 rerun vndr
* run latest vndr so as to collect more LICENSE files
 * remove unused packages
 * vendor github.com/philhofer/fwd with LICENSE.md (MIT)
 * vendor github.com/bsphere/le_go with LICENSE (MIT)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 5a1b06d7fd6a0c8722a4f7aee1edf46d8e2a115b
Component: engine
2017-03-08 02:29:34 +00:00
dfcca19d95 Vendor swarmkit 46bbd41
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 99119fcafa41fb8c95e67b225a3da2902ce0e959
Component: engine
2017-02-27 11:51:00 -08:00
cb4d6aeea8 Update SwarmKit to 6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0
This fix tries to update the SwarmKit from
ed384f3b3957f65e3111bd020f9815f3d4296fa2
to
6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0

The following is the list of docker related changes:
1. Took long time for Docker Swarm service turn desired state from Ready to Running (Issue #28291)
2. Native Swarm in 1.12 - panic: runtime error: index out of range (Issue #25608)
3. Global mode target replicas keep increasing (Issue #30854)
4. Creating service with publish mode=host and without published port crashes swarm manager (Issue #30938)
5. Define signals used to stop containers for updates (Issue #25696) (PR #30754)

This fix fixes #28291, #25608, #30854, #30938.
This fix is required by PR #30754.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ec860ca2526a65ec3b7059666b8e65bab9acf62c
Component: engine
2017-02-16 08:50:00 -08:00
cb75ffb99b Update SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2
This fix updates SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2.
Notable changes since last update (3ca4775ba4a5519e2225c3337c7db8901ec39d26):

1. Fix duplicated ports allocation with restarted swarm. (Docker issue #29247)
2. Topology-aware scheduling (Docker PR #30725)

Docker issue #29247 was labeled 1.13.1, though it is advised that
related SwarmKit changes only to be merged to master
(based on the feedback https://github.com/docker/swarmkit/pull/1802#issuecomment-274143500)

This fix fixes #29247 (master only).
This fix is related to #30725.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6fb3a9d33c08069cd9b5182b70b403a671385ed2
Component: engine
2017-02-08 11:59:13 -08:00
958fd45277 Update swarmkit vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 2bea87393b7673fc88531851803f073198527021
Component: engine
2017-02-07 11:08:36 -08:00
8c590c8511 Update SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
This fix updates SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
(from 037b4913929019d44bc927870bf2d92ce9ca261f)

The following issues in docker are related
- Can not update service in host publish mode (#30199) (fixed)
- Add `ReadonlyRootfs` in ContainerSpec for `--read-only` (#29972) (needed)
- Explicitly disallow network pluginv1 creation in swarm mode
  (See discussion in docker/swarmkit/pull/1899, docker/swarmkit/pull/1894,
  and docker/docker/pull/30332#issuecomment-274277948)

This fix fixes #30199

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 849816dd0fbd70d0e46567fffc7416b667bff9b5
Component: engine
2017-01-29 08:11:26 -08:00
d93ce12d04 Vendor swarmkit, containerd, and related dependencies
Update swarmkit to 037b491.

As swarmkit switched to a newer gRPC version, this also involves
updating Docker's vendored gRPC, which in turn requires updating
containerd to a new version that has protobufs generated against this
gRPC version.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 3e987e1732ee5c51e95934afabba3fedfd16c4af
Component: engine
2017-01-23 17:51:14 -08:00
b4573da32a Vendor swarmkit
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: eb13865d4e43d3084b017bf2b1287cff5e060b77
Component: engine
2017-01-19 17:20:33 -08:00
5bf9b5443d Update swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857
This commit updates swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f3a274fa08d70e25b31ba0e0603d14d3b9997c32
Component: engine
2017-01-10 03:46:42 -08:00
5932f8db18 vendor: update dependencies for go-digest
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 083ad52f607e83b41e508827c8d502448f606a09
Component: engine
2017-01-06 18:48:52 -08:00
e1affcf1a8 Revendor swarmkit
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 423ba6f223ac167fd84b96eebd94679e4ec8e52c
Component: engine
2016-12-14 17:02:48 -08:00
f6ae1b2ad9 Vendor swarmkit
Update swarmkit to deec7ba2c4ef48f20ebe9674afbcced606a5339e, from the master branch.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 7375507eeae61cfb5e93f074235320687595b07d
Component: engine
2016-12-05 04:56:40 +00:00
a8959c0a37 revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 51247185a2c53854163276404a3438c9eb38c3b5
Component: engine
2016-11-22 17:01:02 -08:00
45eb178352 Update swarmkit to efd44df04cc0fd828de5947263858c3a5a2729b1
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: bc739a8d70044263b1b71c28b8465fe2c84d3262
Component: engine
2016-11-11 15:18:34 +01:00
1e77cc5379 vendor: update swarmkit to bddd3f0
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2a68f0f0016caa6cef8d32726002b9ad02a4c56c
Component: engine
2016-11-09 16:08:52 -08:00
6f6d63afeb Update swarmkit to 00890359d8bfba630824b66b848dbf7851149fef
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6e885540a208fe555e3b746d136c84f76e988f8a
Component: engine
2016-11-09 22:38:24 +01:00
22b4540407 Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
This fix revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0.

This fix is related to 28031.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f0e2eb24cfb6b1e888a93acc971386130e7e99ba
Component: engine
2016-11-07 17:57:20 -08:00
fc88fcd016 Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 014eeb539beaf84c69dc2a97b8ffd32551219d0e
Component: engine
2016-11-04 12:26:37 -07:00
61646d77af project: use vndr for vendoring
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f2614f2107c838d014d31b806e3b8a9f1395cb2b
Component: engine
2016-11-03 15:31:46 -07:00