From 051ec11adf5257b0140ad0e5b0a489714988de94 Mon Sep 17 00:00:00 2001
From: matt durham <mattdurham@ppog.org>
Date: Wed, 10 Jul 2024 16:02:53 -0400
Subject: [PATCH 1/2] Update references to golan 1.22.5 and build image 0.1.3.

---
 .github/workflows/check-linux-build-image.yml                 | 4 ++--
 CHANGELOG.md                                                  | 4 ++++
 Dockerfile                                                    | 2 +-
 Dockerfile.windows                                            | 2 +-
 docs/Makefile                                                 | 4 ++--
 go.mod                                                        | 2 +-
 internal/cmd/integration-tests/configs/kafka/Dockerfile       | 2 +-
 .../cmd/integration-tests/configs/otel-metrics-gen/Dockerfile | 2 +-
 internal/cmd/integration-tests/configs/prom-gen/Dockerfile    | 2 +-
 tools/build-image/Dockerfile                                  | 2 +-
 tools/make/build-container.mk                                 | 2 +-
 11 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml
index 26a2f835f6..32bd3918ac 100644
--- a/.github/workflows/check-linux-build-image.yml
+++ b/.github/workflows/check-linux-build-image.yml
@@ -25,7 +25,7 @@ jobs:
           push: false
           tags: grafana/alloy-build-image:latest
           build-args: |
-            GO_RUNTIME=golang:1.22.3-bullseye
+            GO_RUNTIME=golang:1.22.5-bullseye
 
       - name: Create test Linux build image for boring crypto
         uses: docker/build-push-action@v6
@@ -34,4 +34,4 @@ jobs:
           push: false
           tags: grafana/alloy-build-image:latest
           build-args: |
-            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.3-bullseye
+            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.5-bullseye
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f325aa6c29..1cb57992bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,10 @@ Main (unreleased)
   discovery did not result in a fatal failure at startup and could lead to
   potential split-brain issues. (@thampiotr)
 
+### Other
+
+- Use Go 1.22.5 for builds. (@mattdurham)
+
 v1.2.0
 -----------------
 
diff --git a/Dockerfile b/Dockerfile
index 771384b34f..62067825d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 # default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
 # in environment variables.
 
-FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.2 as build
+FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.3 as build
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
 ARG TARGETOS
diff --git a/Dockerfile.windows b/Dockerfile.windows
index ca82be7758..cdb1a5d6cb 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -1,4 +1,4 @@
-FROM grafana/alloy-build-image:v0.1.2-windows as builder
+FROM grafana/alloy-build-image:v0.1.3-windows as builder
 ARG VERSION
 ARG RELEASE_BUILD=1
 ARG GO_TAGS
diff --git a/docs/Makefile b/docs/Makefile
index d1ff60d771..2ea60a40c8 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -11,7 +11,7 @@ include docs.mk
 docs: check-cloudwatch-integration
 
 check-cloudwatch-integration:
-	$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.3-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
+	$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.5-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
 
 generate-cloudwatch-integration:
-	$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.3-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
+	$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.5-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
diff --git a/go.mod b/go.mod
index 888a20bcfa..322da32bfb 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/alloy
 
-go 1.22.3
+go 1.22.5
 
 require (
 	cloud.google.com/go/pubsub v1.36.1
diff --git a/internal/cmd/integration-tests/configs/kafka/Dockerfile b/internal/cmd/integration-tests/configs/kafka/Dockerfile
index 624421c610..5c0205fcbe 100644
--- a/internal/cmd/integration-tests/configs/kafka/Dockerfile
+++ b/internal/cmd/integration-tests/configs/kafka/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.3 as build
+FROM golang:1.22.5 as build
 WORKDIR /app/
 COPY go.mod go.sum ./
 COPY syntax/go.mod syntax/go.sum ./syntax/
diff --git a/internal/cmd/integration-tests/configs/otel-metrics-gen/Dockerfile b/internal/cmd/integration-tests/configs/otel-metrics-gen/Dockerfile
index 0381f4c7b2..0d402bc156 100644
--- a/internal/cmd/integration-tests/configs/otel-metrics-gen/Dockerfile
+++ b/internal/cmd/integration-tests/configs/otel-metrics-gen/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.3 as build
+FROM golang:1.22.5 as build
 WORKDIR /app/
 COPY go.mod go.sum ./
 COPY syntax/go.mod syntax/go.sum ./syntax/
diff --git a/internal/cmd/integration-tests/configs/prom-gen/Dockerfile b/internal/cmd/integration-tests/configs/prom-gen/Dockerfile
index eb48cbc4a7..3d66ab97ae 100644
--- a/internal/cmd/integration-tests/configs/prom-gen/Dockerfile
+++ b/internal/cmd/integration-tests/configs/prom-gen/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.3 as build
+FROM golang:1.22.5 as build
 WORKDIR /app/
 COPY go.mod go.sum ./
 COPY syntax/go.mod syntax/go.sum ./syntax/
diff --git a/tools/build-image/Dockerfile b/tools/build-image/Dockerfile
index 4ff97d2bed..7c95dbcca7 100644
--- a/tools/build-image/Dockerfile
+++ b/tools/build-image/Dockerfile
@@ -4,7 +4,7 @@
 # default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
 # in environment variables.
 
-# NOTE: The GO_RUNTIME is used to switch between the default Google go runtime and mcr.microsoft.com/oss/go/microsoft/golang:1.22.3-bullseye which is a Microsoft
+# NOTE: The GO_RUNTIME is used to switch between the default Google go runtime and mcr.microsoft.com/oss/go/microsoft/golang:1.22.5-bullseye which is a Microsoft
 # fork of go that allows using windows crypto instead of boring crypto. Details at https://github.com/microsoft/go/tree/microsoft/main/eng/doc/fips
 ARG GO_RUNTIME=mustoverride
 
diff --git a/tools/make/build-container.mk b/tools/make/build-container.mk
index be79eef452..9c92bd45a4 100644
--- a/tools/make/build-container.mk
+++ b/tools/make/build-container.mk
@@ -34,7 +34,7 @@
 # variable names should be passed through to the container.
 
 USE_CONTAINER       ?= 0
-BUILD_IMAGE_VERSION ?= v0.1.2
+BUILD_IMAGE_VERSION ?= v0.1.3
 BUILD_IMAGE         ?= grafana/alloy-build-image:$(BUILD_IMAGE_VERSION)
 DOCKER_OPTS         ?= -it
 

From 4b3bd96adfc9f3f193e8c08c75a664ce2b6684ea Mon Sep 17 00:00:00 2001
From: matt durham <mattdurham@ppog.org>
Date: Wed, 10 Jul 2024 16:17:05 -0400
Subject: [PATCH 2/2] Update drone.

---
 .drone/drone.yml | 58 ++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/.drone/drone.yml b/.drone/drone.yml
index 0f56506b91..086ed83ac2 100644
--- a/.drone/drone.yml
+++ b/.drone/drone.yml
@@ -110,7 +110,7 @@ steps:
 - commands:
   - apt-get update -y && apt-get install -y libsystemd-dev
   - make lint
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Lint
 trigger:
   event:
@@ -125,7 +125,7 @@ platform:
 steps:
 - commands:
   - make GO_TAGS="nodocker" test
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Run Go tests
 trigger:
   event:
@@ -140,7 +140,7 @@ platform:
 steps:
 - commands:
   - K8S_USE_DOCKER_NETWORK=1 make test
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Run Go tests
   volumes:
   - name: docker
@@ -163,7 +163,7 @@ platform:
 steps:
 - commands:
   - go test -tags="nodocker,nonetwork" ./...
-  image: grafana/alloy-build-image:v0.1.2-windows
+  image: grafana/alloy-build-image:v0.1.3-windows
   name: Run Go tests
 trigger:
   ref:
@@ -178,7 +178,7 @@ platform:
 steps:
 - commands:
   - make alloy-image
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Build container
   volumes:
   - name: docker
@@ -204,7 +204,7 @@ platform:
 steps:
 - commands:
   - '& "C:/Program Files/git/bin/bash.exe" -c "make alloy-image-windows"'
-  image: grafana/alloy-build-image:v0.1.2-windows
+  image: grafana/alloy-build-image:v0.1.3-windows
   name: Build container
   volumes:
   - name: docker
@@ -231,7 +231,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
     make alloy
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Build
 trigger:
   event:
@@ -248,7 +248,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
     make alloy
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Build
 trigger:
   event:
@@ -265,7 +265,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM=
     make alloy
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Build
 trigger:
   event:
@@ -282,7 +282,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM=
     make alloy
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Build
 trigger:
   event:
@@ -298,7 +298,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Build
 trigger:
   event:
@@ -314,7 +314,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Build
 trigger:
   event:
@@ -330,7 +330,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make alloy
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Build
 trigger:
   event:
@@ -346,7 +346,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Build
 trigger:
   event:
@@ -363,7 +363,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
     GOEXPERIMENT=boringcrypto make alloy
-  image: grafana/alloy-build-image:v0.1.2-boringcrypto
+  image: grafana/alloy-build-image:v0.1.3-boringcrypto
   name: Build
 trigger:
   event:
@@ -380,7 +380,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
     GOEXPERIMENT=boringcrypto make alloy
-  image: grafana/alloy-build-image:v0.1.2-boringcrypto
+  image: grafana/alloy-build-image:v0.1.3-boringcrypto
   name: Build
 trigger:
   event:
@@ -396,7 +396,7 @@ steps:
 - commands:
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   failure: ignore
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Configure QEMU
   volumes:
   - name: docker
@@ -416,7 +416,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Publish container
   volumes:
   - name: docker
@@ -439,7 +439,7 @@ steps:
 - commands:
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   failure: ignore
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Configure QEMU
   volumes:
   - name: docker
@@ -459,7 +459,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Publish container
   volumes:
   - name: docker
@@ -493,7 +493,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.2-windows
+  image: grafana/alloy-build-image:v0.1.3-windows
   name: Build containers
   volumes:
   - name: docker
@@ -516,7 +516,7 @@ steps:
 - commands:
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   failure: ignore
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Configure QEMU
   volumes:
   - name: docker
@@ -536,7 +536,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Publish container
   volumes:
   - name: docker
@@ -559,7 +559,7 @@ steps:
 - commands:
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   failure: ignore
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Configure QEMU
   volumes:
   - name: docker
@@ -579,7 +579,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Publish container
   volumes:
   - name: docker
@@ -613,7 +613,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.2-windows
+  image: grafana/alloy-build-image:v0.1.3-windows
   name: Build containers
   volumes:
   - name: docker
@@ -714,7 +714,7 @@ steps:
       from_secret: gpg_private_key
     GPG_PUBLIC_KEY:
       from_secret: gpg_public_key
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Publish release
   volumes:
   - name: docker
@@ -737,7 +737,7 @@ steps:
 - commands:
   - DOCKER_OPTS="" make dist/alloy-linux-amd64
   - DOCKER_OPTS="" make test-packages
-  image: grafana/alloy-build-image:v0.1.2
+  image: grafana/alloy-build-image:v0.1.3
   name: Test Linux system packages
   volumes:
   - name: docker
@@ -835,6 +835,6 @@ kind: secret
 name: updater_private_key
 ---
 kind: signature
-hmac: 9e7f730273fac5080f5f78a9ebaa753225b7638136eefb982df5e46f9183b99c
+hmac: ee269482e125ef982b0dffcf21ded182eb20960f97adf0513610fac49a1ab775
 
 ...