From dbb39e3d700500a4e51c6a9a3e8f4810ceb53bcb Mon Sep 17 00:00:00 2001 From: Bo Du Date: Fri, 20 Mar 2020 17:03:32 -0400 Subject: [PATCH] [build] upgrade golang and builder --- docker/m3dbnode/Dockerfile | 6 ++++-- docker/m3dbnode/Dockerfile-setcap | 4 ++-- docker/m3dbnode/development.Dockerfile | 4 ++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docker/m3dbnode/Dockerfile b/docker/m3dbnode/Dockerfile index d883f05f38..9a823e025e 100644 --- a/docker/m3dbnode/Dockerfile +++ b/docker/m3dbnode/Dockerfile @@ -3,7 +3,7 @@ # dependency tool we have. Until we migrate to a new version of glide or go # modules, we need to use this older base image. # https://github.com/m3db/m3/issues/628 -FROM golang:1.12-alpine3.9 AS builder +FROM golang:1.14-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide @@ -19,9 +19,11 @@ RUN cd /go/src/github.com/m3db/m3/ && \ make m3dbnode-linux-amd64 # Stage 2: lightweight "release" -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " +ENV GODEBUG madvdontneed=1 + EXPOSE 2379/tcp 2380/tcp 7201/tcp 7203/tcp 9000-9004/tcp RUN apk add --no-cache curl jq diff --git a/docker/m3dbnode/Dockerfile-setcap b/docker/m3dbnode/Dockerfile-setcap index d8a48521b1..8d5e0261e2 100644 --- a/docker/m3dbnode/Dockerfile-setcap +++ b/docker/m3dbnode/Dockerfile-setcap @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.12-alpine3.9 AS builder +FROM golang:1.14-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide @@ -15,7 +15,7 @@ RUN cd /go/src/github.com/m3db/m3/ && \ make m3dbnode-linux-amd64 # Stage 2: lightweight "release" -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " EXPOSE 2379/tcp 2380/tcp 7201/tcp 7203/tcp 9000-9004/tcp diff --git a/docker/m3dbnode/development.Dockerfile b/docker/m3dbnode/development.Dockerfile index bd5af11e59..e19984b0da 100644 --- a/docker/m3dbnode/development.Dockerfile +++ b/docker/m3dbnode/development.Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< Updated upstream FROM alpine:latest +======= +FROM alpine:3.11 +>>>>>>> Stashed changes LABEL maintainer="The M3DB Authors " RUN apk add --no-cache curl jq