CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix docker build. update dockerfiles to Go 1.14 (#8051)

This commit is contained in:
Steven Soroka 2020-08-28 16:39:55 -04:00 committed by GitHub
parent 4ebb8c7820
commit 5d999f85f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -94,6 +94,11 @@ deps:
telegraf: telegraf:
go build -ldflags "$(LDFLAGS)" ./cmd/telegraf go build -ldflags "$(LDFLAGS)" ./cmd/telegraf
# Used by dockerfile builds
.PHONY: go-install
go-install:
go install -ldflags "-w -s $(LDFLAGS)" ./cmd/telegraf
.PHONY: test .PHONY: test
test: test:
go test -short $(race_detector) ./... go test -short $(race_detector) ./...

4
scripts/alpine.docker
View File

@ -1,10 +1,10 @@
FROM golang:1.13.13 as builder FROM golang:1.14.7 as builder
WORKDIR /go/src/github.com/influxdata/telegraf WORKDIR /go/src/github.com/influxdata/telegraf
COPY . /go/src/github.com/influxdata/telegraf COPY . /go/src/github.com/influxdata/telegraf
RUN CGO_ENABLED=0 make go-install RUN CGO_ENABLED=0 make go-install
FROM alpine:3.6 FROM alpine:3.12
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors && \ RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors && \
update-ca-certificates update-ca-certificates

2
scripts/stretch.docker
View File

@ -1,4 +1,4 @@
FROM golang:1.13.13 as builder FROM golang:1.14.7-stretch as builder
WORKDIR /go/src/github.com/influxdata/telegraf WORKDIR /go/src/github.com/influxdata/telegraf
COPY . /go/src/github.com/influxdata/telegraf COPY . /go/src/github.com/influxdata/telegraf