Skip to content

Commit d0fbad0

Browse files
fix(deps): Move to Go 1.24.2 (backport release-3.5.x) (#17805)
Co-authored-by: Paul Rogers <[email protected]>
1 parent 02cf2a6 commit d0fbad0

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

.github/workflows/images.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"lambda-promtail-image":
1111
"env":
1212
"BUILD_TIMEOUT": 60
13-
"GO_VERSION": "1.24.1"
13+
"GO_VERSION": "1.24.2"
1414
"IMAGE_PREFIX": "public.ecr.aws/grafana"
1515
"RELEASE_LIB_REF": "main"
1616
"RELEASE_REPO": "grafana/loki"
@@ -107,7 +107,7 @@
107107
"loki-canary-boringcrypto-image":
108108
"env":
109109
"BUILD_TIMEOUT": 60
110-
"GO_VERSION": "1.24.1"
110+
"GO_VERSION": "1.24.2"
111111
"IMAGE_PREFIX": "grafana"
112112
"RELEASE_LIB_REF": "main"
113113
"RELEASE_REPO": "grafana/loki"
@@ -230,7 +230,7 @@
230230
"loki-canary-image":
231231
"env":
232232
"BUILD_TIMEOUT": 60
233-
"GO_VERSION": "1.24.1"
233+
"GO_VERSION": "1.24.2"
234234
"IMAGE_PREFIX": "grafana"
235235
"RELEASE_LIB_REF": "main"
236236
"RELEASE_REPO": "grafana/loki"
@@ -353,7 +353,7 @@
353353
"loki-image":
354354
"env":
355355
"BUILD_TIMEOUT": 60
356-
"GO_VERSION": "1.24.1"
356+
"GO_VERSION": "1.24.2"
357357
"IMAGE_PREFIX": "grafana"
358358
"RELEASE_LIB_REF": "main"
359359
"RELEASE_REPO": "grafana/loki"
@@ -476,7 +476,7 @@
476476
"promtail-image":
477477
"env":
478478
"BUILD_TIMEOUT": 60
479-
"GO_VERSION": "1.24.1"
479+
"GO_VERSION": "1.24.2"
480480
"IMAGE_PREFIX": "grafana"
481481
"RELEASE_LIB_REF": "main"
482482
"RELEASE_REPO": "grafana/loki"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ BUILD_IN_CONTAINER ?= true
1818
CI ?= false
1919

2020
# Ensure you run `make release-workflows` after changing this
21-
GO_VERSION := 1.24.1
21+
GO_VERSION := 1.24.2
2222
# Ensure you run `make IMAGE_TAG=<updated-tag> build-image-push` after changing this
2323
BUILD_IMAGE_TAG := 0.34.6
2424

clients/cmd/promtail/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG GO_VERSION=1.24
22

3-
FROM golang:${GO_VERSION}-bookworm as build
3+
FROM golang:${GO_VERSION}-bookworm AS build
44
ARG IMAGE_TAG
55

66
COPY . /src/loki

clients/cmd/promtail/Dockerfile.arm32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24-bookworm as build
1+
FROM golang:1.24-bookworm AS build
22

33
COPY . /src/loki
44
WORKDIR /src/loki

clients/cmd/promtail/Dockerfile.cross

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
ARG BUILD_IMAGE=grafana/loki-build-image:0.34.0
1+
ARG BUILD_IMAGE=grafana/loki-build-image:0.34.6
22
ARG GO_VERSION=1.24
33
# Directories in this file are referenced from the root of the project not this folder
44
# This file is intended to be called from the root like so:
55
# docker build -t grafana/promtail -f clients/cmd/promtail/Dockerfile .
6-
FROM golang:${GO_VERSION}-alpine as goenv
6+
FROM golang:${GO_VERSION}-alpine AS goenv
77
RUN go env GOARCH > /goarch && \
88
go env GOARM > /goarm
99

clients/cmd/promtail/Dockerfile.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is intended to be called from the root like so:
33
# docker build -t grafana/promtail -f clients/cmd/promtail/Dockerfile.debug .
44

5-
FROM grafana/loki-build-image:0.34.0 AS build
5+
FROM grafana/loki-build-image:0.34.6 AS build
66
ARG GOARCH="amd64"
77
COPY . /src/loki
88
WORKDIR /src/loki

0 commit comments

Comments
 (0)