From 6045ddaf518ede09290034af95e518a79f6ae4f4 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 7 Jul 2018 18:24:56 +0100 Subject: [PATCH] pkg: Use alpine 3.8 version of go (no need for go1.10) Signed-off-by: Rolf Neugebauer --- pkg/init/Dockerfile | 5 +---- pkg/runc/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 9938d5dc8..076103116 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -4,10 +4,7 @@ RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-he ADD usermode-helper.c ./ RUN LDFLAGS=-static CFLAGS=-Werror make usermode-helper -# containerd v1.1.x requires go1.10 which is currently a separate package in -# Alpine 3.7 Use the same version here for consistency and because we use the -# containerd client library. -RUN apk add --no-cache go1.10 musl-dev +RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin COPY cmd /go/src/cmd diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index 3349da9ef..e46344694 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,12 +1,10 @@ FROM linuxkit/alpine:6264e5b39af8eb1da7ffa4c05a7ccc597da01197 as alpine -# containerd v1.1.x requires go1.10 which is currently a separate package in Alpine 3.7 -# Use the same version of go for consistency. RUN \ apk add \ bash \ gcc \ git \ - go1.10 \ + go \ libc-dev \ libseccomp-dev \ linux-headers \