Skip to content

Commit 9faa0e1

Browse files
committed
Update build-image-to-use to use 1.22.5.
1 parent f44ef85 commit 9faa0e1

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.drone/drone.yml

+3-3
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.3-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/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.22.3-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/alloy-build-image:$IMAGE_TAG
4949
./tools/build-image
5050
environment:
@@ -835,6 +835,6 @@ kind: secret
835835
name: updater_private_key
836836
---
837837
kind: signature
838-
hmac: 60dbc7f93c24089a985433ec810276f8bbf84f6b93a173e27b2d278388329511
838+
hmac: 9e7f730273fac5080f5f78a9ebaa753225b7638136eefb982df5e46f9183b99c
839839

840840
...

.drone/pipelines/build_images.jsonnet

+2-2
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.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.22.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.22.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.22.5-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
5959
],
6060
}],
6161
volumes: [{

tools/build-image/windows/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM library/golang:1.22.3-windowsservercore-1809
1+
FROM library/golang:1.22.5-windowsservercore-1809
22

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

tools/make/build-container.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
# variable names should be passed through to the container.
3535

3636
USE_CONTAINER ?= 0
37-
BUILD_IMAGE_VERSION ?= v0.1.2
37+
BUILD_IMAGE_VERSION ?= v0.1.3
3838
BUILD_IMAGE ?= grafana/alloy-build-image:$(BUILD_IMAGE_VERSION)
3939
DOCKER_OPTS ?= -it
4040

0 commit comments

Comments
 (0)