chore: update Golang in Dockerfiles

influxdata · May 26, 2024 · 144de96 · 144de96
1 parent fa9bd84
commit 144de96
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,14 +17,16 @@ jobs:
         exclude:
         - go: 1.21
           package: jaeger-influxdb
+        - go: 1.21
+          package: tests-integration
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 1
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
 
@@ -52,11 +54,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 1
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v5
       with:
         go-version: "1.22"
 

diff --git a/jaeger-influxdb/Dockerfile b/jaeger-influxdb/Dockerfile
@@ -1,5 +1,5 @@
 #syntax=docker/dockerfile:1.2
-FROM golang:1.20-alpine3.16 AS builder
+FROM golang:1.22-alpine3.20 AS builder
 RUN apk --update --no-cache add ca-certificates
 ENV CGO_ENABLED 0
 

diff --git a/jaeger-influxdb/Dockerfile.all-in-one b/jaeger-influxdb/Dockerfile.all-in-one
@@ -1,5 +1,5 @@
 #syntax=docker/dockerfile:1.2
-FROM golang:1.20-alpine3.16 AS builder
+FROM golang:1.22-alpine3.20 AS builder
 RUN apk --update --no-cache add ca-certificates
 ENV CGO_ENABLED 0
 

diff --git a/otelcol-influxdb/Dockerfile b/otelcol-influxdb/Dockerfile
@@ -1,5 +1,5 @@
 #syntax=docker/dockerfile:1.2
-FROM golang:1.22-alpine3.19 AS builder
+FROM golang:1.22-alpine3.20 AS builder
 RUN apk --update --no-cache add ca-certificates
 ENV CGO_ENABLED 0
 

diff --git a/tests-integration/go.mod b/tests-integration/go.mod
@@ -1,13 +1,13 @@
 module tests
 
-go 1.21.0
+go 1.22.0
 
-toolchain go1.21.10
+toolchain go1.22.3
 
 require (
 	github.com/influxdata/influxdb/v2 v2.6.1
 	github.com/influxdata/line-protocol/v2 v2.2.1
-	github.com/influxdata/telegraf v1.27.2
+	github.com/influxdata/telegraf v0.0.0-0.20240525225432-1e4dabce191c
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.101.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.101.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.101.0