Upgrade Go to 1.17.5 for integration tests + Dockerfiles (#4602)

aknuds1 · web-flow · commit f0c5aab059b9 · 2022-01-06T16:18:04.000+01:00
* Upgrade Go to 1.17.5 for integration tests

Signed-off-by: Arve Knudsen &lt;arve.knudsen@gmail.com&gt;

* Upgrade to Go 1.17 in Dockerfiles

Signed-off-by: Arve Knudsen &lt;arve.knudsen@gmail.com&gt;
diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
@@ -96,13 +96,9 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Upgrade golang
-        run: |
-          cd /tmp
-          wget https://dl.google.com/go/go1.16.6.linux-amd64.tar.gz
-          tar -zxvf go1.16.6.linux-amd64.tar.gz
-          sudo rm -fr /usr/local/go
-          sudo mv /tmp/go /usr/local/go
-          cd -
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.17.5
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Install Docker Client
diff --git a/build-image/Dockerfile b/build-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.6-buster
+FROM golang:1.17.5-buster
 ARG goproxyValue
 ENV GOPROXY=${goproxyValue}
 RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev && \
diff --git a/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile b/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16
+FROM golang:1.17
 ENV CGO_ENABLED=0
 RUN go get github.com/go-delve/delve/cmd/dlv
 
diff --git a/development/tsdb-blocks-storage-s3/dev.dockerfile b/development/tsdb-blocks-storage-s3/dev.dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16
+FROM golang:1.17
 ENV CGO_ENABLED=0
 RUN go get github.com/go-delve/delve/cmd/dlv
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.16.6-buster`
	`1`	`+FROM golang:1.17.5-buster`
`2`	`2`	`ARG goproxyValue`
`3`	`3`	`ENV GOPROXY=${goproxyValue}`
`4`	`4`	`RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev && \`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.16`
	`1`	`+FROM golang:1.17`
`2`	`2`	`ENV CGO_ENABLED=0`
`3`	`3`	`RUN go get github.com/go-delve/delve/cmd/dlv`
`4`	`4`