From 334f9267b6ea2ccf824ed286a8f3ea891163879f Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Thu, 3 Jan 2019 12:41:16 -0800 Subject: [PATCH] Use Go 1.11.4 and 1.10.7 (#5221) --- .circleci/config.yml | 4 ++-- Makefile | 8 ++++---- scripts/ci-1.10.docker | 2 +- scripts/ci-1.11.docker | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae8771583..af248dfa1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,10 +7,10 @@ defaults: - image: 'quay.io/influxdb/telegraf-ci:1.9.7' go-1_10: &go-1_10 docker: - - image: 'quay.io/influxdb/telegraf-ci:1.10.4' + - image: 'quay.io/influxdb/telegraf-ci:1.10.7' go-1_11: &go-1_11 docker: - - image: 'quay.io/influxdb/telegraf-ci:1.11.1' + - image: 'quay.io/influxdb/telegraf-ci:1.11.4' version: 2 jobs: diff --git a/Makefile b/Makefile index 9c7fe1cae..8c256b713 100644 --- a/Makefile +++ b/Makefile @@ -133,13 +133,13 @@ plugin-%: .PHONY: ci-1.11 ci-1.11: - docker build -t quay.io/influxdb/telegraf-ci:1.11.1 - < scripts/ci-1.11.docker - docker push quay.io/influxdb/telegraf-ci:1.11.1 + docker build -t quay.io/influxdb/telegraf-ci:1.11.4 - < scripts/ci-1.11.docker + docker push quay.io/influxdb/telegraf-ci:1.11.4 .PHONY: ci-1.10 ci-1.10: - docker build -t quay.io/influxdb/telegraf-ci:1.10.4 - < scripts/ci-1.10.docker - docker push quay.io/influxdb/telegraf-ci:1.10.4 + docker build -t quay.io/influxdb/telegraf-ci:1.10.7 - < scripts/ci-1.10.docker + docker push quay.io/influxdb/telegraf-ci:1.10.7 .PHONY: ci-1.9 ci-1.9: diff --git a/scripts/ci-1.10.docker b/scripts/ci-1.10.docker index b37e908ce..c70b33038 100644 --- a/scripts/ci-1.10.docker +++ b/scripts/ci-1.10.docker @@ -1,4 +1,4 @@ -FROM golang:1.10.4 +FROM golang:1.10.7 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/ci-1.11.docker b/scripts/ci-1.11.docker index 31ff34842..278d5d857 100644 --- a/scripts/ci-1.11.docker +++ b/scripts/ci-1.11.docker @@ -1,4 +1,4 @@ -FROM golang:1.11.1 +FROM golang:1.11.4 RUN chmod -R 755 "$GOPATH"