From 53af0ce80c977185f6420f4d762eca5eac32ef1e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 7 Jul 2018 09:30:51 +0100 Subject: [PATCH] tools/alpine: Remove go1.10 alpine:3.8 comes with go 1.10 as default Signed-off-by: Rolf Neugebauer --- tools/alpine/Dockerfile | 3 +-- tools/alpine/packages | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index ba5756c45..c32405fea 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -43,8 +43,7 @@ RUN mv /etc/apk/repositories /etc/apk/repositories.upstream && echo "/mirror" > # add Go validation tools COPY go-compile.sh /go/bin/ -# containerd v1.1.x requires go1.10 which is currently a separate package in Alpine 3.7 -RUN apk add --no-cache git go1.10 musl-dev +RUN apk add --no-cache git go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin RUN go get -u github.com/golang/lint/golint RUN go get -u github.com/gordonklaus/ineffassign diff --git a/tools/alpine/packages b/tools/alpine/packages index 5a8f3975a..a620a0113 100644 --- a/tools/alpine/packages +++ b/tools/alpine/packages @@ -45,7 +45,6 @@ git gmp-dev gnupg go -go1.10 grep hvtools installkernel