Commit Graph

5 Commits

Author SHA1 Message Date
Tycho Andersen
a208413ac0 fix package builds in some cases
0eb21735ae accidentally broke some package
builds by switching linuxkit/alpine to linuxkit/containerd. Let's revert
the ones that shouldn't be there.

Closes #1991

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-07 16:19:40 -06:00
Ian Campbell
0eb21735ae Update to containerd bdf9f5f7388e8203e63a74b89800f7f3dd4a7743
Note that this is not the latest (which was 95efd45db073 at time of writing)
but the next commit 6428b4bad0c2 merges "Port ctr to use client package" breaks
the use of `ctr run --runtime-config` (by removing that option).

This contains https://github.com/containerd/containerd/pull/954 which was
causing some services to fail to start.

All previous uses of 15541037b9 are updated to
5749f2e9e6.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-07 09:38:10 +01:00
Tycho Andersen
336d92de3b wireguard-tools: use linuxkit/alpine as base image
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-26 15:55:33 -06:00
Tycho Andersen
8c96d38ca3 wireguard tools: use ORG pattern as in other makefiles
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-26 15:45:41 -06:00
Tycho Andersen
d6d9a696ad wireguard project: move to new-style init
Rather than re-build the whole init, let's just include the wireguard tools
in a tools repo.

This also moves *most* of the stuff to new linuxkit infrastructure, instead
of the legacy mobylinux. And checks an item off the TODO list.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-26 15:35:31 -06:00