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