From 6ee21a37c6d40998f3b2ccb1549efa5e6329270c Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Thu, 12 Oct 2017 15:16:33 +0100
Subject: [PATCH] alpine: Pull in go (1.9) from Edge

This is a requirement of containerd.

Signed-off-by: Ian Campbell <ijc@docker.com>
---
 tools/alpine/Dockerfile       | 3 +++
 tools/alpine/versions.aarch64 | 5 +++--
 tools/alpine/versions.x86_64  | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile
index 142515907..566b6a1b6 100644
--- a/tools/alpine/Dockerfile
+++ b/tools/alpine/Dockerfile
@@ -16,6 +16,9 @@ RUN cat /tmp/packages.$(uname -m) >> /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
 
+# containerd requires go 1.9 which is only in edge
+RUN apk fetch --recursive -o /mirror/$(uname -m) -X http://dl-cdn.alpinelinux.org/alpine/edge/community -U go
+
 # install abuild for signing
 RUN apk add --no-cache abuild
 
diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64
index 413046a92..45ff8222e 100644
--- a/tools/alpine/versions.aarch64
+++ b/tools/alpine/versions.aarch64
@@ -1,4 +1,4 @@
-# linuxkit/alpine:d5f568a60d76990407d15fb128fc9d53e363fcee-arm64
+# linuxkit/alpine:d316ab2d54f92b96cde13cff90ead9bc307d9936-arm64
 # automatically generated list of installed packages
 abuild-3.0.0_rc2-r8
 alpine-baselayout-3.0.4-r0
@@ -74,6 +74,7 @@ gmp-dev-6.1.2-r0
 gnupg-2.1.20-r0
 gnutls-3.5.13-r0
 go-1.8.3-r0
+go-1.9.1-r0
 grep-3.0-r0
 guile-2.0.13-r0
 guile-libs-2.0.13-r0
@@ -252,7 +253,7 @@ util-linux-dev-2.28.2-r2
 vde2-libs-2.3.2-r7
 vim-8.0.0595-r0
 wayland-1.13.0-r0
-wireguard-tools-0.0.20171005-r0
+wireguard-tools-0.0.20171011-r0
 wireless-tools-30_pre9-r0
 wpa_supplicant-2.6-r3
 xfsprogs-4.5.0-r0
diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64
index f230c74ad..351b9aa6e 100644
--- a/tools/alpine/versions.x86_64
+++ b/tools/alpine/versions.x86_64
@@ -1,4 +1,4 @@
-# linuxkit/alpine:90aa5d87063049827de536371016bc02138a8f59-amd64
+# linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a-amd64
 # automatically generated list of installed packages
 abuild-3.0.0_rc2-r8
 alpine-baselayout-3.0.4-r0
@@ -75,6 +75,7 @@ gmp-dev-6.1.2-r0
 gnupg-2.1.20-r0
 gnutls-3.5.13-r0
 go-1.8.3-r0
+go-1.9.1-r0
 grep-3.0-r0
 guile-2.0.13-r0
 guile-libs-2.0.13-r0
@@ -260,7 +261,7 @@ util-linux-dev-2.28.2-r2
 vde2-libs-2.3.2-r7
 vim-8.0.0595-r0
 wayland-1.13.0-r0
-wireguard-tools-0.0.20171005-r0
+wireguard-tools-0.0.20171011-r0
 wireless-tools-30_pre9-r0
 wpa_supplicant-2.6-r3
 xfsprogs-4.5.0-r0