Skip to content

Commit

Permalink
update docker files for go modules. Closes influxdata#7170 (influxdat…
Browse files Browse the repository at this point in the history
  • Loading branch information
ssoroka authored Mar 16, 2020
1 parent dafd08c commit fcb038d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
7 changes: 2 additions & 5 deletions scripts/alpine.docker
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
FROM golang:1.11.0 as builder
ENV DEP_VERSION 0.5.0
RUN curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 && chmod +x /usr/local/bin/dep
FROM golang:1.13.8 as builder
WORKDIR /go/src/github.com/influxdata/telegraf
COPY Gopkg.toml Gopkg.lock ./
RUN dep ensure -vendor-only

COPY . /go/src/github.com/influxdata/telegraf
RUN CGO_ENABLED=0 make go-install

Expand Down
7 changes: 2 additions & 5 deletions scripts/stretch.docker
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
FROM golang:1.11.0 as builder
ENV DEP_VERSION 0.5.0
RUN curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 && chmod +x /usr/local/bin/dep
FROM golang:1.13.8 as builder
WORKDIR /go/src/github.com/influxdata/telegraf
COPY Gopkg.toml Gopkg.lock ./
RUN dep ensure -vendor-only

COPY . /go/src/github.com/influxdata/telegraf
RUN make go-install

Expand Down

0 comments on commit fcb038d

Please sign in to comment.