-
Notifications
You must be signed in to change notification settings - Fork 454
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
10 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|