Skip to content

Commit daea756

Browse files
committed
update build image
1 parent 15c295e commit daea756

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

.drone/drone.yml

+29-29
Original file line numberDiff line numberDiff line change
@@ -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.3
113+
image: grafana/alloy-build-image:v0.1.4
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.3
128+
image: grafana/alloy-build-image:v0.1.4
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.3
143+
image: grafana/alloy-build-image:v0.1.4
144144
name: Run Go tests
145145
volumes:
146146
- name: docker
@@ -163,7 +163,7 @@ platform:
163163
steps:
164164
- commands:
165165
- go test -tags="nodocker,nonetwork" ./...
166-
image: grafana/alloy-build-image:v0.1.3-windows
166+
image: grafana/alloy-build-image:v0.1.4-windows
167167
name: Run Go tests
168168
trigger:
169169
ref:
@@ -178,7 +178,7 @@ platform:
178178
steps:
179179
- commands:
180180
- make alloy-image
181-
image: grafana/alloy-build-image:v0.1.3
181+
image: grafana/alloy-build-image:v0.1.4
182182
name: Build container
183183
volumes:
184184
- name: docker
@@ -204,7 +204,7 @@ platform:
204204
steps:
205205
- commands:
206206
- '& "C:/Program Files/git/bin/bash.exe" -c "make alloy-image-windows"'
207-
image: grafana/alloy-build-image:v0.1.3-windows
207+
image: grafana/alloy-build-image:v0.1.4-windows
208208
name: Build container
209209
volumes:
210210
- name: docker
@@ -231,7 +231,7 @@ steps:
231231
- make generate-ui
232232
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
233233
make alloy
234-
image: grafana/alloy-build-image:v0.1.3
234+
image: grafana/alloy-build-image:v0.1.4
235235
name: Build
236236
trigger:
237237
event:
@@ -248,7 +248,7 @@ steps:
248248
- make generate-ui
249249
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
250250
make alloy
251-
image: grafana/alloy-build-image:v0.1.3
251+
image: grafana/alloy-build-image:v0.1.4
252252
name: Build
253253
trigger:
254254
event:
@@ -265,7 +265,7 @@ steps:
265265
- make generate-ui
266266
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM=
267267
make alloy
268-
image: grafana/alloy-build-image:v0.1.3
268+
image: grafana/alloy-build-image:v0.1.4
269269
name: Build
270270
trigger:
271271
event:
@@ -282,7 +282,7 @@ steps:
282282
- make generate-ui
283283
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM=
284284
make alloy
285-
image: grafana/alloy-build-image:v0.1.3
285+
image: grafana/alloy-build-image:v0.1.4
286286
name: Build
287287
trigger:
288288
event:
@@ -298,7 +298,7 @@ steps:
298298
- commands:
299299
- make generate-ui
300300
- GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy
301-
image: grafana/alloy-build-image:v0.1.3
301+
image: grafana/alloy-build-image:v0.1.4
302302
name: Build
303303
trigger:
304304
event:
@@ -314,7 +314,7 @@ steps:
314314
- commands:
315315
- make generate-ui
316316
- GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy
317-
image: grafana/alloy-build-image:v0.1.3
317+
image: grafana/alloy-build-image:v0.1.4
318318
name: Build
319319
trigger:
320320
event:
@@ -330,7 +330,7 @@ steps:
330330
- commands:
331331
- make generate-ui
332332
- GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make alloy
333-
image: grafana/alloy-build-image:v0.1.3
333+
image: grafana/alloy-build-image:v0.1.4
334334
name: Build
335335
trigger:
336336
event:
@@ -346,7 +346,7 @@ steps:
346346
- commands:
347347
- make generate-ui
348348
- GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy
349-
image: grafana/alloy-build-image:v0.1.3
349+
image: grafana/alloy-build-image:v0.1.4
350350
name: Build
351351
trigger:
352352
event:
@@ -363,7 +363,7 @@ steps:
363363
- make generate-ui
364364
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
365365
GOEXPERIMENT=boringcrypto make alloy
366-
image: grafana/alloy-build-image:v0.1.3-boringcrypto
366+
image: grafana/alloy-build-image:v0.1.4-boringcrypto
367367
name: Build
368368
trigger:
369369
event:
@@ -380,7 +380,7 @@ steps:
380380
- make generate-ui
381381
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
382382
GOEXPERIMENT=boringcrypto make alloy
383-
image: grafana/alloy-build-image:v0.1.3-boringcrypto
383+
image: grafana/alloy-build-image:v0.1.4-boringcrypto
384384
name: Build
385385
trigger:
386386
event:
@@ -396,7 +396,7 @@ steps:
396396
- commands:
397397
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
398398
failure: ignore
399-
image: grafana/alloy-build-image:v0.1.3
399+
image: grafana/alloy-build-image:v0.1.4
400400
name: Configure QEMU
401401
volumes:
402402
- name: docker
@@ -416,7 +416,7 @@ steps:
416416
from_secret: docker_password
417417
GCR_CREDS:
418418
from_secret: gcr_admin
419-
image: grafana/alloy-build-image:v0.1.3
419+
image: grafana/alloy-build-image:v0.1.4
420420
name: Publish container
421421
volumes:
422422
- name: docker
@@ -439,7 +439,7 @@ steps:
439439
- commands:
440440
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
441441
failure: ignore
442-
image: grafana/alloy-build-image:v0.1.3
442+
image: grafana/alloy-build-image:v0.1.4
443443
name: Configure QEMU
444444
volumes:
445445
- name: docker
@@ -459,7 +459,7 @@ steps:
459459
from_secret: docker_password
460460
GCR_CREDS:
461461
from_secret: gcr_admin
462-
image: grafana/alloy-build-image:v0.1.3
462+
image: grafana/alloy-build-image:v0.1.4
463463
name: Publish container
464464
volumes:
465465
- name: docker
@@ -493,7 +493,7 @@ steps:
493493
from_secret: docker_password
494494
GCR_CREDS:
495495
from_secret: gcr_admin
496-
image: grafana/alloy-build-image:v0.1.3-windows
496+
image: grafana/alloy-build-image:v0.1.4-windows
497497
name: Build containers
498498
volumes:
499499
- name: docker
@@ -516,7 +516,7 @@ steps:
516516
- commands:
517517
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
518518
failure: ignore
519-
image: grafana/alloy-build-image:v0.1.3
519+
image: grafana/alloy-build-image:v0.1.4
520520
name: Configure QEMU
521521
volumes:
522522
- name: docker
@@ -536,7 +536,7 @@ steps:
536536
from_secret: docker_password
537537
GCR_CREDS:
538538
from_secret: gcr_admin
539-
image: grafana/alloy-build-image:v0.1.3
539+
image: grafana/alloy-build-image:v0.1.4
540540
name: Publish container
541541
volumes:
542542
- name: docker
@@ -559,7 +559,7 @@ steps:
559559
- commands:
560560
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
561561
failure: ignore
562-
image: grafana/alloy-build-image:v0.1.3
562+
image: grafana/alloy-build-image:v0.1.4
563563
name: Configure QEMU
564564
volumes:
565565
- name: docker
@@ -579,7 +579,7 @@ steps:
579579
from_secret: docker_password
580580
GCR_CREDS:
581581
from_secret: gcr_admin
582-
image: grafana/alloy-build-image:v0.1.3
582+
image: grafana/alloy-build-image:v0.1.4
583583
name: Publish container
584584
volumes:
585585
- name: docker
@@ -613,7 +613,7 @@ steps:
613613
from_secret: docker_password
614614
GCR_CREDS:
615615
from_secret: gcr_admin
616-
image: grafana/alloy-build-image:v0.1.3-windows
616+
image: grafana/alloy-build-image:v0.1.4-windows
617617
name: Build containers
618618
volumes:
619619
- name: docker
@@ -714,7 +714,7 @@ steps:
714714
from_secret: gpg_private_key
715715
GPG_PUBLIC_KEY:
716716
from_secret: gpg_public_key
717-
image: grafana/alloy-build-image:v0.1.3
717+
image: grafana/alloy-build-image:v0.1.4
718718
name: Publish release
719719
volumes:
720720
- name: docker
@@ -737,7 +737,7 @@ steps:
737737
- commands:
738738
- DOCKER_OPTS="" make dist/alloy-linux-amd64
739739
- DOCKER_OPTS="" make test-packages
740-
image: grafana/alloy-build-image:v0.1.3
740+
image: grafana/alloy-build-image:v0.1.4
741741
name: Test Linux system packages
742742
volumes:
743743
- name: docker
@@ -835,6 +835,6 @@ kind: secret
835835
name: updater_private_key
836836
---
837837
kind: signature
838-
hmac: d897b4d4c0e2b92087e4eab9ca27b1dbbe2f475172109656ad2d842cb4a5b945
838+
hmac: ed13a019f056d284e2dc9b55e5c2ce2e3470eeb912f7c272b917897b0d25659e
839839

840840
...

Dockerfile

+1-1
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.3 as build
7+
FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.4 as build
88
ARG BUILDPLATFORM
99
ARG TARGETPLATFORM
1010
ARG TARGETOS

Dockerfile.windows

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM grafana/alloy-build-image:v0.1.3-windows as builder
1+
FROM grafana/alloy-build-image:v0.1.4-windows as builder
22
ARG VERSION
33
ARG RELEASE_BUILD=1
44
ARG GO_TAGS

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.3
37+
BUILD_IMAGE_VERSION ?= v0.1.4
3838
BUILD_IMAGE ?= grafana/alloy-build-image:$(BUILD_IMAGE_VERSION)
3939
DOCKER_OPTS ?= -it
4040

0 commit comments

Comments
 (0)