From d2f3215890fd0d00fbe7a27624b6bc6af7318f03 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 22 Oct 2019 13:18:02 -0700
Subject: [PATCH] Build with Go 1.13.3 and 1.12.12 (#6565)

---
 .circleci/config.yml   | 4 ++--
 Makefile               | 8 ++++----
 appveyor.yml           | 4 ++--
 scripts/ci-1.12.docker | 2 +-
 scripts/ci-1.13.docker | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 50a8080ec..a32bd77a4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,10 +6,10 @@ defaults:
       GOFLAGS: -p=8
   go-1_12: &go-1_12
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.12.10'
+      - image: 'quay.io/influxdb/telegraf-ci:1.12.12'
   go-1_13: &go-1_13
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.13.1'
+      - image: 'quay.io/influxdb/telegraf-ci:1.13.3'
 
 version: 2
 jobs:
diff --git a/Makefile b/Makefile
index 0846e73b6..aeae48e4c 100644
--- a/Makefile
+++ b/Makefile
@@ -131,10 +131,10 @@ plugin-%:
 
 .PHONY: ci-1.13
 ci-1.13:
-	docker build -t quay.io/influxdb/telegraf-ci:1.13.1 - < scripts/ci-1.13.docker
-	docker push quay.io/influxdb/telegraf-ci:1.13.1
+	docker build -t quay.io/influxdb/telegraf-ci:1.13.3 - < scripts/ci-1.13.docker
+	docker push quay.io/influxdb/telegraf-ci:1.13.3
 
 .PHONY: ci-1.12
 ci-1.12:
-	docker build -t quay.io/influxdb/telegraf-ci:1.12.10 - < scripts/ci-1.12.docker
-	docker push quay.io/influxdb/telegraf-ci:1.12.10
+	docker build -t quay.io/influxdb/telegraf-ci:1.12.12 - < scripts/ci-1.12.docker
+	docker push quay.io/influxdb/telegraf-ci:1.12.12
diff --git a/appveyor.yml b/appveyor.yml
index 8197172ba..fba80d46f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,11 +13,11 @@ platform: x64
 
 install:
   - IF NOT EXIST "C:\Cache" mkdir C:\Cache
-  - IF NOT EXIST "C:\Cache\go1.13.1.msi" curl -o "C:\Cache\go1.13.1.msi" https://storage.googleapis.com/golang/go1.13.1.windows-amd64.msi
+  - IF NOT EXIST "C:\Cache\go1.13.3.msi" curl -o "C:\Cache\go1.13.3.msi" https://storage.googleapis.com/golang/go1.13.3.windows-amd64.msi
   - IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
   - IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
   - IF EXIST "C:\Go" rmdir /S /Q C:\Go
-  - msiexec.exe /i "C:\Cache\go1.13.1.msi" /quiet
+  - msiexec.exe /i "C:\Cache\go1.13.3.msi" /quiet
   - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
   - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
   - go get -d github.com/golang/dep
diff --git a/scripts/ci-1.12.docker b/scripts/ci-1.12.docker
index 0572f4641..f60f49a43 100644
--- a/scripts/ci-1.12.docker
+++ b/scripts/ci-1.12.docker
@@ -1,4 +1,4 @@
-FROM golang:1.12.10
+FROM golang:1.12.12
 
 RUN chmod -R 755 "$GOPATH"
 
diff --git a/scripts/ci-1.13.docker b/scripts/ci-1.13.docker
index d859850dc..c3c9792d2 100644
--- a/scripts/ci-1.13.docker
+++ b/scripts/ci-1.13.docker
@@ -1,4 +1,4 @@
-FROM golang:1.13.1
+FROM golang:1.13.3
 
 RUN chmod -R 755 "$GOPATH"