From 7eb6cf34a97da896d87671cf18bf80c9fe43f929 Mon Sep 17 00:00:00 2001 From: hainenber Date: Tue, 16 Jan 2024 23:03:30 +0700 Subject: [PATCH] feat(build): use Go 1.21.6 for builds Signed-off-by: hainenber --- CHANGELOG.md | 2 ++ build-image/Dockerfile | 2 +- build-image/windows/Dockerfile | 2 +- go.mod | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a7599bbc329..d8883d237acc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,6 +77,8 @@ Main (unreleased) - Updated dependency to add support for Go 1.22 (@stefanb) +- Use Go 1.22.0 for builds. (@hainenber) + v0.39.2 (2024-1-31) -------------------- diff --git a/build-image/Dockerfile b/build-image/Dockerfile index eeea8fdce018..bf8eb01dc846 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -23,7 +23,7 @@ FROM alpine:3.17 as helm RUN apk add --no-cache helm # Dependency: Go and Go dependencies -FROM golang:1.21.4-bullseye as golang +FROM golang:1.21.6-bullseye as golang # Keep in sync with cmd/grafana-agent-operator/DEVELOPERS.md ENV CONTROLLER_GEN_VERSION v0.9.2 diff --git a/build-image/windows/Dockerfile b/build-image/windows/Dockerfile index 6664d8928e82..26cc62c445be 100644 --- a/build-image/windows/Dockerfile +++ b/build-image/windows/Dockerfile @@ -1,4 +1,4 @@ -FROM library/golang:1.21.4-windowsservercore-1809 +FROM library/golang:1.21.6-windowsservercore-1809 SHELL ["powershell", "-command"] diff --git a/go.mod b/go.mod index c9800748482b..bcfc8c85841b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/agent -go 1.21.0 +go 1.21.6 require ( cloud.google.com/go/pubsub v1.33.0