Skip to content

Commit

Permalink
[build] upgrade golang and builder
Browse files Browse the repository at this point in the history
  • Loading branch information
notbdu committed Mar 20, 2020
1 parent 72ca215 commit dbb39e3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
6 changes: 4 additions & 2 deletions docker/m3dbnode/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"

# Install Glide
Expand All @@ -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 <[email protected]>"

ENV GODEBUG madvdontneed=1

EXPOSE 2379/tcp 2380/tcp 7201/tcp 7203/tcp 9000-9004/tcp

RUN apk add --no-cache curl jq
Expand Down
4 changes: 2 additions & 2 deletions docker/m3dbnode/Dockerfile-setcap
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"

# Install Glide
Expand All @@ -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 <[email protected]>"

EXPOSE 2379/tcp 2380/tcp 7201/tcp 7203/tcp 9000-9004/tcp
Expand Down
4 changes: 4 additions & 0 deletions docker/m3dbnode/development.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<<<<<<< Updated upstream
FROM alpine:latest
=======
FROM alpine:3.11
>>>>>>> Stashed changes
LABEL maintainer="The M3DB Authors <[email protected]>"

RUN apk add --no-cache curl jq
Expand Down

0 comments on commit dbb39e3

Please sign in to comment.