From a837a6fc656e649ad0940f7353d580a449c36cbf Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 20 Jul 2017 18:48:35 +0200 Subject: [PATCH] wireguard: add tools to alpine as package not into filesystem Signed-off-by: Jason A. Donenfeld --- docs/wireguard.md | 2 +- tools/alpine/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/wireguard.md b/docs/wireguard.md index 5d4fafa11..b405fbed3 100644 --- a/docs/wireguard.md +++ b/docs/wireguard.md @@ -18,7 +18,7 @@ A full technical paper from NDSS 2017 is available [here](https://www.wireguard. The default kernels build WireGuard in as a module. ### Userspace Tools -The userspace tools are part of `tools/alpine`. +The userspace tools are now a package available in `tools/alpine`, which can be installed via `apk add wireguard-tools`. ## Quickstart To give WireGuard a spin, the [official quick start](https://www.wireguard.com/quickstart/) is a good way to get going. For containers, diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index f5a60a47f..f2f1ab504 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -11,6 +11,9 @@ COPY packages /tmp/ RUN mkdir -p /mirror/$(uname -m) && \ apk fetch --recursive -o /mirror/$(uname -m) $(apk info; cat /tmp/packages) +# add the tools for WireGuard, since the kernel module is now included, but from edge/testing +RUN apk fetch --recursive -o /mirror/$(uname -m) -X http://dl-cdn.alpinelinux.org/alpine/edge/testing -U wireguard-tools + # install abuild for signing RUN apk add --no-cache abuild @@ -27,9 +30,6 @@ RUN abuild-sign /mirror/$(uname -m)/APKINDEX.tar.gz # fetch OVMF for qemu EFI boot (this is not added as a package) RUN apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/community ovmf -# add the tools for WireGuard, since the kernel module is now included -RUN apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/testing -U wireguard-tools - # set this as our repo but keep a copy of the upstream for downstream use RUN mv /etc/apk/repositories /etc/apk/repositories.upstream && echo "/mirror" > /etc/apk/repositories && apk update