From f255c53eb1a587600977a54867c39ec84b065a2e Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Sat, 25 May 2024 16:52:30 -0700 Subject: [PATCH] chore: update Golang in Dockerfiles --- jaeger-influxdb/Dockerfile | 2 +- jaeger-influxdb/Dockerfile.all-in-one | 2 +- otelcol-influxdb/Dockerfile | 2 +- tests-integration/go.mod | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jaeger-influxdb/Dockerfile b/jaeger-influxdb/Dockerfile index aadb0175..b4ded28e 100644 --- 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 index ef585aa7..7fa21e1d 100644 --- 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 index 64a4bb51..2caa0ecc 100644 --- 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 index 75a9f148..78fe4ad6 100644 --- 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