Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
build_linux:
name: Build on Linux
runs-on: github-hosted-ubuntu-x64-large
container: grafana/alloy-build-image:v0.1.25@sha256:306ef67a1593ebdcdc3de9e7360001183830f45b05f213cd2c6f47114196c9a6
container: grafana/alloy-build-image:v0.1.26@sha256:54ef2371fc6b049d932c58d4622c88b573b45c393b7622fe6cca492ac4525dbe
strategy:
matrix:
os: [linux]
Expand All @@ -42,7 +42,7 @@ jobs:
build_linux_boringcrypto:
name: Build on Linux (boringcrypto)
runs-on: github-hosted-ubuntu-x64-large
container: grafana/alloy-build-image:v0.1.25-boringcrypto@sha256:31052c9ec5b8bfeec927984955541629882eb8c6518ff9106fb484e9b711875c
container: grafana/alloy-build-image:v0.1.26-boringcrypto@sha256:1727887982c65a40e489b41ec1c793e97bdf04f5774dba329cd8ee54bd7cae86
strategy:
matrix:
os: [linux]
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
build_freebsd:
name: Build on FreeBSD (AMD64)
runs-on: github-hosted-ubuntu-x64-large
container: grafana/alloy-build-image:v0.1.25@sha256:306ef67a1593ebdcdc3de9e7360001183830f45b05f213cd2c6f47114196c9a6
container: grafana/alloy-build-image:v0.1.26@sha256:54ef2371fc6b049d932c58d4622c88b573b45c393b7622fe6cca492ac4525dbe
steps:
- name: Checkout code
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-alloy-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ permissions:
jobs:
publish_linux_container:
name: Publish Alloy Linux container
container: grafana/alloy-build-image:v0.1.25@sha256:306ef67a1593ebdcdc3de9e7360001183830f45b05f213cd2c6f47114196c9a6
container: grafana/alloy-build-image:v0.1.26@sha256:54ef2371fc6b049d932c58d4622c88b573b45c393b7622fe6cca492ac4525dbe
runs-on:
labels: github-hosted-ubuntu-x64-large
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-publish-alloy-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

build_alloy:
name: Build Alloy
container: grafana/alloy-build-image:v0.1.25@sha256:306ef67a1593ebdcdc3de9e7360001183830f45b05f213cd2c6f47114196c9a6
container: grafana/alloy-build-image:v0.1.26@sha256:54ef2371fc6b049d932c58d4622c88b573b45c393b7622fe6cca492ac4525dbe
runs-on:
labels: github-hosted-ubuntu-x64-large
needs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_linux_system_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Test Linux system packages
runs-on: ubuntu-latest
container:
image: grafana/alloy-build-image:v0.1.25@sha256:306ef67a1593ebdcdc3de9e7360001183830f45b05f213cd2c6f47114196c9a6
image: grafana/alloy-build-image:v0.1.26@sha256:54ef2371fc6b049d932c58d4622c88b573b45c393b7622fe6cca492ac4525dbe
volumes:
- /var/run/docker.sock
steps:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
# default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
# in environment variables.

FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.25 AS ui-build
FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.26 AS ui-build
ARG BUILDPLATFORM
COPY ./internal/web/ui /ui
WORKDIR /ui
RUN --mount=type=cache,target=/ui/node_modules,sharing=locked \
npm install \
&& npm run build

FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.25 AS build
FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.26 AS build

ARG BUILDPLATFORM
ARG TARGETPLATFORM
Expand Down
2 changes: 1 addition & 1 deletion collector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module github.com/grafana/alloy/otel_engine

go 1.25.5
go 1.25.6

require (
github.com/grafana/alloy v0.0.0-00010101000000-000000000000
Expand Down
4 changes: 2 additions & 2 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ docs: check-cloudwatch-integration
endif

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

generate-cloudwatch-integration:
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.25.5-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.25.6-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
2 changes: 1 addition & 1 deletion extension/alloyengine/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/grafana/alloy/extension/alloyengine

go 1.25.5
go 1.25.6

replace github.com/grafana/alloy => ../..

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/grafana/alloy

go 1.25.5
go 1.25.6

// This local replace is required for local development and testing of the syntax submodule.
// It is intentionally kept outside the generated block to avoid being overwritten by dependency management tools.
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/integration-tests/configs/kafka/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.25.5 as build
FROM golang:1.25.6 as build
WORKDIR /app/
COPY go.mod go.sum ./
COPY syntax/go.mod syntax/go.sum ./syntax/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.25.5 as build
FROM golang:1.25.6 as build
WORKDIR /app/
COPY go.mod go.sum ./
COPY syntax/go.mod syntax/go.sum ./syntax/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.25.5 as build
FROM golang:1.25.6 as build
WORKDIR /app/
COPY go.mod go.sum ./
COPY syntax/go.mod syntax/go.sum ./syntax/
Expand Down
2 changes: 1 addition & 1 deletion syntax/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/grafana/alloy/syntax

go 1.25.5
go 1.25.6

require (
github.com/blang/semver/v4 v4.0.0
Expand Down
2 changes: 1 addition & 1 deletion tools/make/build-container.mk
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# variable names should be passed through to the container.

USE_CONTAINER ?= 0
BUILD_IMAGE_VERSION ?= v0.1.25
BUILD_IMAGE_VERSION ?= v0.1.26
BUILD_IMAGE ?= grafana/alloy-build-image:$(BUILD_IMAGE_VERSION)
DOCKER_OPTS ?= -it

Expand Down
Loading