Skip to content

Commit 954130d

Browse files
wildumwildum
authored
Update go rc (#2456)
* update build image to 1.23.5 (#2449) * cherrypick commits
1 parent 34fc871 commit 954130d

File tree

13 files changed

+48
-46
lines changed

13 files changed

+48
-46
lines changed

‎.drone/drone.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
1111
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
1212
- docker buildx create --name multiarch --driver docker-container --use
13-
- docker buildx build --build-arg="GO_RUNTIME=golang:1.23.3-bullseye" --push --platform
13+
- docker buildx build --build-arg="GO_RUNTIME=golang:1.23.5-bullseye" --push --platform
1414
linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image
1515
environment:
1616
DOCKER_LOGIN:
@@ -44,7 +44,7 @@ steps:
4444
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
4545
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
4646
- docker buildx create --name multiarch --driver docker-container --use
47-
- docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.3-bullseye"
47+
- docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-bullseye"
4848
--push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG
4949
./tools/build-image
5050
environment:
@@ -110,7 +110,7 @@ steps:
110110
- commands:
111111
- apt-get update -y && apt-get install -y libsystemd-dev
112112
- make lint
113-
image: grafana/alloy-build-image:v0.1.7
113+
image: grafana/alloy-build-image:v0.1.8
114114
name: Lint
115115
trigger:
116116
event:
@@ -125,7 +125,7 @@ platform:
125125
steps:
126126
- commands:
127127
- make GO_TAGS="nodocker" test
128-
image: grafana/alloy-build-image:v0.1.7
128+
image: grafana/alloy-build-image:v0.1.8
129129
name: Run Go tests
130130
trigger:
131131
event:
@@ -140,7 +140,7 @@ platform:
140140
steps:
141141
- commands:
142142
- K8S_USE_DOCKER_NETWORK=1 make test
143-
image: grafana/alloy-build-image:v0.1.7
143+
image: grafana/alloy-build-image:v0.1.8
144144
name: Run Go tests
145145
volumes:
146146
- name: docker
@@ -164,7 +164,7 @@ steps:
164164
- commands:
165165
- '& "C:/Program Files/git/bin/bash.exe" -c ''go test -tags="nodocker,nonetwork"
166166
./...'''
167-
image: grafana/alloy-build-image:v0.1.7-windows
167+
image: grafana/alloy-build-image:v0.1.8-windows
168168
name: Run Go tests
169169
trigger:
170170
ref:
@@ -179,7 +179,7 @@ platform:
179179
steps:
180180
- commands:
181181
- make alloy-image
182-
image: grafana/alloy-build-image:v0.1.7
182+
image: grafana/alloy-build-image:v0.1.8
183183
name: Build container
184184
volumes:
185185
- name: docker
@@ -205,7 +205,7 @@ platform:
205205
steps:
206206
- commands:
207207
- '& "C:/Program Files/git/bin/bash.exe" -c "make alloy-image-windows"'
208-
image: grafana/alloy-build-image:v0.1.7-windows
208+
image: grafana/alloy-build-image:v0.1.8-windows
209209
name: Build container
210210
volumes:
211211
- name: docker
@@ -232,7 +232,7 @@ steps:
232232
- make generate-ui
233233
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
234234
make alloy
235-
image: grafana/alloy-build-image:v0.1.7
235+
image: grafana/alloy-build-image:v0.1.8
236236
name: Build
237237
trigger:
238238
event:
@@ -249,7 +249,7 @@ steps:
249249
- make generate-ui
250250
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
251251
make alloy
252-
image: grafana/alloy-build-image:v0.1.7
252+
image: grafana/alloy-build-image:v0.1.8
253253
name: Build
254254
trigger:
255255
event:
@@ -266,7 +266,7 @@ steps:
266266
- make generate-ui
267267
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM=
268268
make alloy
269-
image: grafana/alloy-build-image:v0.1.7
269+
image: grafana/alloy-build-image:v0.1.8
270270
name: Build
271271
trigger:
272272
event:
@@ -283,7 +283,7 @@ steps:
283283
- make generate-ui
284284
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM=
285285
make alloy
286-
image: grafana/alloy-build-image:v0.1.7
286+
image: grafana/alloy-build-image:v0.1.8
287287
name: Build
288288
trigger:
289289
event:
@@ -299,7 +299,7 @@ steps:
299299
- commands:
300300
- make generate-ui
301301
- GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy
302-
image: grafana/alloy-build-image:v0.1.7
302+
image: grafana/alloy-build-image:v0.1.8
303303
name: Build
304304
trigger:
305305
event:
@@ -315,7 +315,7 @@ steps:
315315
- commands:
316316
- make generate-ui
317317
- GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy
318-
image: grafana/alloy-build-image:v0.1.7
318+
image: grafana/alloy-build-image:v0.1.8
319319
name: Build
320320
trigger:
321321
event:
@@ -331,7 +331,7 @@ steps:
331331
- commands:
332332
- make generate-ui
333333
- GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make alloy
334-
image: grafana/alloy-build-image:v0.1.7
334+
image: grafana/alloy-build-image:v0.1.8
335335
name: Build
336336
trigger:
337337
event:
@@ -347,7 +347,7 @@ steps:
347347
- commands:
348348
- make generate-ui
349349
- GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy
350-
image: grafana/alloy-build-image:v0.1.7
350+
image: grafana/alloy-build-image:v0.1.8
351351
name: Build
352352
trigger:
353353
event:
@@ -364,7 +364,7 @@ steps:
364364
- make generate-ui
365365
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
366366
GOEXPERIMENT=boringcrypto make alloy
367-
image: grafana/alloy-build-image:v0.1.7-boringcrypto
367+
image: grafana/alloy-build-image:v0.1.8-boringcrypto
368368
name: Build
369369
trigger:
370370
event:
@@ -381,7 +381,7 @@ steps:
381381
- make generate-ui
382382
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
383383
GOEXPERIMENT=boringcrypto make alloy
384-
image: grafana/alloy-build-image:v0.1.7-boringcrypto
384+
image: grafana/alloy-build-image:v0.1.8-boringcrypto
385385
name: Build
386386
trigger:
387387
event:
@@ -397,7 +397,7 @@ steps:
397397
- commands:
398398
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
399399
failure: ignore
400-
image: grafana/alloy-build-image:v0.1.7
400+
image: grafana/alloy-build-image:v0.1.8
401401
name: Configure QEMU
402402
volumes:
403403
- name: docker
@@ -417,7 +417,7 @@ steps:
417417
from_secret: docker_password
418418
GCR_CREDS:
419419
from_secret: gcr_admin
420-
image: grafana/alloy-build-image:v0.1.7
420+
image: grafana/alloy-build-image:v0.1.8
421421
name: Publish container
422422
volumes:
423423
- name: docker
@@ -440,7 +440,7 @@ steps:
440440
- commands:
441441
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
442442
failure: ignore
443-
image: grafana/alloy-build-image:v0.1.7
443+
image: grafana/alloy-build-image:v0.1.8
444444
name: Configure QEMU
445445
volumes:
446446
- name: docker
@@ -460,7 +460,7 @@ steps:
460460
from_secret: docker_password
461461
GCR_CREDS:
462462
from_secret: gcr_admin
463-
image: grafana/alloy-build-image:v0.1.7
463+
image: grafana/alloy-build-image:v0.1.8
464464
name: Publish container
465465
volumes:
466466
- name: docker
@@ -494,7 +494,7 @@ steps:
494494
from_secret: docker_password
495495
GCR_CREDS:
496496
from_secret: gcr_admin
497-
image: grafana/alloy-build-image:v0.1.7-windows
497+
image: grafana/alloy-build-image:v0.1.8-windows
498498
name: Build containers
499499
volumes:
500500
- name: docker
@@ -517,7 +517,7 @@ steps:
517517
- commands:
518518
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
519519
failure: ignore
520-
image: grafana/alloy-build-image:v0.1.7
520+
image: grafana/alloy-build-image:v0.1.8
521521
name: Configure QEMU
522522
volumes:
523523
- name: docker
@@ -537,7 +537,7 @@ steps:
537537
from_secret: docker_password
538538
GCR_CREDS:
539539
from_secret: gcr_admin
540-
image: grafana/alloy-build-image:v0.1.7
540+
image: grafana/alloy-build-image:v0.1.8
541541
name: Publish container
542542
volumes:
543543
- name: docker
@@ -560,7 +560,7 @@ steps:
560560
- commands:
561561
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
562562
failure: ignore
563-
image: grafana/alloy-build-image:v0.1.7
563+
image: grafana/alloy-build-image:v0.1.8
564564
name: Configure QEMU
565565
volumes:
566566
- name: docker
@@ -580,7 +580,7 @@ steps:
580580
from_secret: docker_password
581581
GCR_CREDS:
582582
from_secret: gcr_admin
583-
image: grafana/alloy-build-image:v0.1.7
583+
image: grafana/alloy-build-image:v0.1.8
584584
name: Publish container
585585
volumes:
586586
- name: docker
@@ -614,7 +614,7 @@ steps:
614614
from_secret: docker_password
615615
GCR_CREDS:
616616
from_secret: gcr_admin
617-
image: grafana/alloy-build-image:v0.1.7-windows
617+
image: grafana/alloy-build-image:v0.1.8-windows
618618
name: Build containers
619619
volumes:
620620
- name: docker
@@ -715,7 +715,7 @@ steps:
715715
from_secret: gpg_private_key
716716
GPG_PUBLIC_KEY:
717717
from_secret: gpg_public_key
718-
image: grafana/alloy-build-image:v0.1.7
718+
image: grafana/alloy-build-image:v0.1.8
719719
name: Publish release
720720
volumes:
721721
- name: docker
@@ -738,7 +738,7 @@ steps:
738738
- commands:
739739
- DOCKER_OPTS="" make dist/alloy-linux-amd64
740740
- DOCKER_OPTS="" make test-packages
741-
image: grafana/alloy-build-image:v0.1.7
741+
image: grafana/alloy-build-image:v0.1.8
742742
name: Test Linux system packages
743743
volumes:
744744
- name: docker
@@ -836,6 +836,6 @@ kind: secret
836836
name: updater_private_key
837837
---
838838
kind: signature
839-
hmac: 760087c49893d6970a81c973518d26b582c3d4673d3c28b90553361de8b6e03a
839+
hmac: 5c0ba3650cd2bbdccc1b19b96b07ac8f76d78b4dcd461dddc140857a86db1900
840840

841841
...

‎.drone/pipelines/build_images.jsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ local locals = {
3232
'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD',
3333
'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes',
3434
'docker buildx create --name multiarch --driver docker-container --use',
35-
'docker buildx build --build-arg="GO_RUNTIME=golang:1.23.3-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
35+
'docker buildx build --build-arg="GO_RUNTIME=golang:1.23.5-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
3636
],
3737
}],
3838
volumes: [{
@@ -55,7 +55,7 @@ local locals = {
5555
'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD',
5656
'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes',
5757
'docker buildx create --name multiarch --driver docker-container --use',
58-
'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.3-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
58+
'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
5959
],
6060
}],
6161
volumes: [{

‎.github/workflows/check-linux-build-image.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
push: false
3434
tags: grafana/alloy-build-image:latest
3535
build-args: |
36-
GO_RUNTIME=golang:1.23.3-bullseye
36+
GO_RUNTIME=golang:1.23.5-bullseye
3737
3838
- name: Create test Linux build image for boring crypto
3939
uses: docker/build-push-action@v6
@@ -42,4 +42,4 @@ jobs:
4242
push: false
4343
tags: grafana/alloy-build-image:latest
4444
build-args: |
45-
GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.3-bullseye
45+
GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-bullseye

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This document contains a historical list of changes between releases. Only
77
changes that impact end-user behavior are listed; changes to documentation or
88
internal API changes are not present.
99

10-
v1.6.0-rc.1
10+
v1.6.0-rc.2
1111
-----------------
1212

1313
### Breaking changes
@@ -166,6 +166,8 @@ v1.6.0-rc.1
166166
This mechanism use the AWS MSK IAM SASL Signer for Go https://github.com/aws/aws-msk-iam-sasl-signer-go.
167167
https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/32500
168168

169+
- Use Go 1.23.5 for builds. (@wildum)
170+
169171
v1.5.1
170172
-----------------
171173

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
55
# in environment variables.
66

7-
FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.7 as build
7+
FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.8 as build
88
ARG BUILDPLATFORM
99
ARG TARGETPLATFORM
1010
ARG TARGETOS

‎Dockerfile.windows‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM grafana/alloy-build-image:v0.1.7-windows as builder
1+
FROM grafana/alloy-build-image:v0.1.8-windows as builder
22
ARG VERSION
33
ARG RELEASE_BUILD=1
44
ARG GO_TAGS

‎docs/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ docs: check-cloudwatch-integration
1515
endif
1616

1717
check-cloudwatch-integration:
18-
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.23.3-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
18+
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.23.5-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
1919

2020
generate-cloudwatch-integration:
21-
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.23.3-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
21+
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.23.5-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/grafana/alloy
22

3-
go 1.23.3
3+
go 1.23.5
44

55
require (
66
cloud.google.com/go/pubsub v1.40.0

‎internal/cmd/integration-tests/configs/kafka/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23.3 as build
1+
FROM golang:1.23.5 as build
22
WORKDIR /app/
33
COPY go.mod go.sum ./
44
COPY syntax/go.mod syntax/go.sum ./syntax/

‎internal/cmd/integration-tests/configs/otel-gen/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23.3 as build
1+
FROM golang:1.23.5 as build
22
WORKDIR /app/
33
COPY go.mod go.sum ./
44
COPY syntax/go.mod syntax/go.sum ./syntax/

0 commit comments

Comments
 (0)