diff --git a/.circleci/config.yml b/.circleci/config.yml index 027a529cb0385..832a0ec2adda3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ executors: go-1_17: working_directory: '/go/src/github.com/influxdata/telegraf' docker: - - image: 'quay.io/influxdb/telegraf-ci:1.17.0' + - image: 'quay.io/influxdb/telegraf-ci:1.17.2' environment: GOFLAGS: -p=8 mac: diff --git a/Makefile b/Makefile index 12267c04403bb..6e35298fb299b 100644 --- a/Makefile +++ b/Makefile @@ -206,8 +206,8 @@ ci-1.16: .PHONY: ci-1.17 ci-1.17: - docker build -t quay.io/influxdb/telegraf-ci:1.17.0 - < scripts/ci-1.17.docker - docker push quay.io/influxdb/telegraf-ci:1.17.0 + docker build -t quay.io/influxdb/telegraf-ci:1.17.2 - < scripts/ci-1.17.docker + docker push quay.io/influxdb/telegraf-ci:1.17.2 .PHONY: install install: $(buildbin) diff --git a/scripts/alpine.docker b/scripts/alpine.docker index 8c2418083ef8c..84cfcac2268a0 100644 --- a/scripts/alpine.docker +++ b/scripts/alpine.docker @@ -1,4 +1,4 @@ -FROM golang:1.17.0 as builder +FROM golang:1.17.2 as builder WORKDIR /go/src/github.com/influxdata/telegraf COPY . /go/src/github.com/influxdata/telegraf diff --git a/scripts/buster.docker b/scripts/buster.docker index fbb18eee24f17..17b0cb581cc92 100644 --- a/scripts/buster.docker +++ b/scripts/buster.docker @@ -1,4 +1,4 @@ -FROM golang:1.17.0-buster as builder +FROM golang:1.17.2-buster as builder WORKDIR /go/src/github.com/influxdata/telegraf COPY . /go/src/github.com/influxdata/telegraf diff --git a/scripts/ci-1.17.docker b/scripts/ci-1.17.docker index 574ab7be7a896..a69a0d7eddbe3 100644 --- a/scripts/ci-1.17.docker +++ b/scripts/ci-1.17.docker @@ -1,4 +1,4 @@ -FROM golang:1.17.0 +FROM golang:1.17.2 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh index b839358136d98..4e7fb756161dc 100644 --- a/scripts/installgo_mac.sh +++ b/scripts/installgo_mac.sh @@ -3,8 +3,8 @@ set -eux GO_ARCH="darwin-amd64" -GO_VERSION="1.17" -GO_VERSION_SHA="355bd544ce08d7d484d9d7de05a71b5c6f5bc10aa4b316688c2192aeb3dacfd1" # from https://golang.org/dl +GO_VERSION="1.17.2" +GO_VERSION_SHA="7914497a302a132a465d33f5ee044ce05568bacdb390ab805cb75a3435a23f94" # from https://golang.org/dl # This path is cachable. (Saving in /usr/local/ would cause issues restoring the cache.) path="/usr/local/Cellar" @@ -18,7 +18,7 @@ setup_go () { echo "Checksum failed" >&2 exit 1 fi - + sudo rm -rf ${path}/go sudo tar -C $path -xzf go${GO_VERSION}.${GO_ARCH}.tar.gz ln -sf ${path}/go/bin/go /usr/local/bin/go diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh index d035447570c8a..bd5dcca3dbc14 100644 --- a/scripts/installgo_windows.sh +++ b/scripts/installgo_windows.sh @@ -2,7 +2,7 @@ set -eux -GO_VERSION="1.17" +GO_VERSION="1.17.2" setup_go () { choco upgrade golang --version=${GO_VERSION}