From fcb038d35254f73aabf8f29309fada6e2af0a3a4 Mon Sep 17 00:00:00 2001 From: Steven Soroka Date: Mon, 16 Mar 2020 19:21:21 -0400 Subject: [PATCH] update docker files for go modules. Closes #7170 (#7179) --- scripts/alpine.docker | 7 ++----- scripts/stretch.docker | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/scripts/alpine.docker b/scripts/alpine.docker index 0103a16d4..8eb86b39d 100644 --- a/scripts/alpine.docker +++ b/scripts/alpine.docker @@ -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 diff --git a/scripts/stretch.docker b/scripts/stretch.docker index 906e0c504..805786075 100644 --- a/scripts/stretch.docker +++ b/scripts/stretch.docker @@ -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