Skip to content

Commit 36f5a68

Browse files
committed
Update references to Go version
1 parent 47c279f commit 36f5a68

File tree

11 files changed

+16
-16
lines changed

11 files changed

+16
-16
lines changed

.drone/drone.yml

Lines changed: 2 additions & 2 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.22.1-bullseye" --push --platform
13+
- docker buildx build --build-arg="GO_RUNTIME=golang:1.22.5-bullseye" --push --platform
1414
linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./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.22.1-bullseye"
47+
- docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.5-bullseye"
4848
--push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG
4949
./build-image
5050
environment:

.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.22.1-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./build-image',
35+
'docker buildx build --build-arg="GO_RUNTIME=golang:1.22.5-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./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.22.1-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./build-image',
58+
'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.5-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./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
@@ -25,7 +25,7 @@ jobs:
2525
push: false
2626
tags: grafana/agent-build-image:latest
2727
build-args: |
28-
GO_RUNTIME=golang:1.22.1-bullseye
28+
GO_RUNTIME=golang:1.22.5-bullseye
2929
3030
- name: Create test Linux build image for boring crypto
3131
uses: docker/build-push-action@v5
@@ -34,4 +34,4 @@ jobs:
3434
push: false
3535
tags: grafana/agent-build-image:latest
3636
build-args: |
37-
GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.1-bullseye
37+
GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.5-bullseye

build-image/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-
# NOTE: The GO_RUNTIME is used to switch between the default Google go runtime and mcr.microsoft.com/oss/go/microsoft/golang:1.22.1-bullseye which is a Microsoft
7+
# 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
88
# 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
99
ARG GO_RUNTIME=mustoverride
1010

build-image/windows/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM library/golang:1.22.1-windowsservercore-1809
1+
FROM library/golang:1.22.5-windowsservercore-1809
22

33
SHELL ["powershell", "-command"]
44

cmd/grafana-agent/Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN ""C:\Program Files\git\bin\bash.exe" -c "RELEASE_BUILD=${RELEASE_BUILD} VERS
1414
RUN ""C:\Program Files\git\bin\bash.exe" -c "RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} GO_TAGS='builtinassets' make agent""
1515
# In this case, we're separating the clean command from make agent to avoid an issue where access to some mod cache
1616
# files is denied immediately after make agent, for example:
17-
# "go: remove C:\go\pkg\mod\golang.org\[email protected].1.windows-amd64\bin\go.exe: Access is denied."
17+
# "go: remove C:\go\pkg\mod\golang.org\[email protected].5.windows-amd64\bin\go.exe: Access is denied."
1818
RUN ""C:\Program Files\git\bin\bash.exe" -c "go clean -cache -modcache""
1919

2020
# Use the smallest container possible for the final image

cmd/grafana-agentctl/Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SHELL ["cmd", "/S", "/C"]
1010
RUN ""C:\Program Files\git\bin\bash.exe" -c "RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} make agentctl""
1111
# We're separating the clean command from make agent to avoid an issue where access to some mod cache
1212
# files is denied immediately after make agentctl, for example:
13-
# "go: remove C:\go\pkg\mod\golang.org\[email protected].1.windows-amd64\bin\go.exe: Access is denied."
13+
# "go: remove C:\go\pkg\mod\golang.org\[email protected].5.windows-amd64\bin\go.exe: Access is denied."
1414
RUN ""C:\Program Files\git\bin\bash.exe" -c "go clean -cache -modcache""
1515

1616
# Use the smallest container possible for the final image

docs/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ include docs.mk
1111
docs: check-cloudwatch-integration
1212

1313
check-cloudwatch-integration:
14-
$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.1-bullseye go run static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/static/configuration/integrations/cloudwatch-exporter-config.md
15-
$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.1-bullseye go run static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md
14+
$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.5-bullseye go run static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/static/configuration/integrations/cloudwatch-exporter-config.md
15+
$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.5-bullseye go run static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md
1616

1717
generate-cloudwatch-integration:
18-
$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.1-bullseye go run static/integrations/cloudwatch_exporter/docs/doc.go generate
18+
$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.5-bullseye go run static/integrations/cloudwatch_exporter/docs/doc.go generate
1919

2020
sources/assets/hierarchy.svg: sources/operator/hierarchy.dot
2121
cat $< | $(PODMAN) run --rm -i nshine/dot dot -Tsvg > $@

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.22.1 as build
1+
FROM golang:1.22.5 as build
22
WORKDIR /app/
33
COPY go.mod go.sum ./
44
RUN go mod download

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

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

0 commit comments

Comments
 (0)