From c9e382ade079586e6b27f7de0bfdf8e667c4155e Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 18 Apr 2018 14:09:58 +0100 Subject: [PATCH] Use go1.10 for containerd test package too Signed-off-by: Ian Campbell --- test/pkg/containerd/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index c97116ae0..b603413cc 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -3,6 +3,7 @@ RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) # xfsprogs is required for xfs test (mkfs.xfs) +# containerd v1.1.x requires go1.10 which is currently a separate package in Alpine 3.7 RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ busybox \ @@ -10,7 +11,7 @@ RUN apk add --no-cache --initdb -p /out \ btrfs-progs-dev \ gcc \ git \ - go \ + go1.10 \ libc-dev \ linux-headers \ make \