diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 136004de7..a2b5db1a5 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 AS mirror +FROM alpine:3.11 AS mirror # update base image RUN apk update && apk upgrade -a @@ -47,7 +47,7 @@ RUN mv /etc/apk/repositories /etc/apk/repositories.upstream && echo "/mirror" > COPY go-compile.sh /go/bin/ 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 golang.org/x/lint/golint RUN go get -u github.com/gordonklaus/ineffassign RUN go get -u github.com/LK4D4/vndr @@ -89,7 +89,7 @@ RUN set -e && \ cp iucode_tool /iucode_tool; \ fi -FROM alpine:3.9 +FROM alpine:3.11 COPY --from=mirror /etc/apk/repositories /etc/apk/repositories COPY --from=mirror /etc/apk/repositories.upstream /etc/apk/repositories.upstream diff --git a/tools/alpine/packages b/tools/alpine/packages index d06b4fce9..4b10784f1 100644 --- a/tools/alpine/packages +++ b/tools/alpine/packages @@ -66,7 +66,6 @@ libc-utils libc6-compat libcap-ng-dev libedit-dev -libelf-dev libressl-dev libseccomp-dev libtirpc-dev