diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 709fd660153..ccb8e0e6957 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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.28@sha256:982eb27dfc3111a3a81eb605d2e80d0c6c21a32842c2652b6390be6cd80da6fb + container: grafana/alloy-build-image:v0.1.29@sha256:2500d89efb3bc1cf0a94a00a197ec0f316cc409b7fc031a8de0f6092a782bdd6 strategy: matrix: os: [linux] @@ -41,7 +41,7 @@ jobs: build_linux_boringcrypto: name: Build on Linux (boringcrypto) runs-on: github-hosted-ubuntu-x64-large - container: grafana/alloy-build-image:v0.1.28-boringcrypto@sha256:7e25eeaf9fd70d49a00f80da45e99cc6c963362915f60b6e86325d58680dd209 + container: grafana/alloy-build-image:v0.1.29-boringcrypto@sha256:a0256f8a06b634446f2d856b0325ed416ebd46f2ca097eebbf3c8359912821b4 strategy: matrix: os: [linux] @@ -118,7 +118,7 @@ jobs: build_freebsd: name: Build on FreeBSD (AMD64) runs-on: github-hosted-ubuntu-x64-large - container: grafana/alloy-build-image:v0.1.28@sha256:982eb27dfc3111a3a81eb605d2e80d0c6c21a32842c2652b6390be6cd80da6fb + container: grafana/alloy-build-image:v0.1.29@sha256:2500d89efb3bc1cf0a94a00a197ec0f316cc409b7fc031a8de0f6092a782bdd6 steps: - name: Checkout code uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml index 6500b0f1bf1..cc2e8269b34 100644 --- a/.github/workflows/check-linux-build-image.yml +++ b/.github/workflows/check-linux-build-image.yml @@ -14,8 +14,8 @@ jobs: strategy: matrix: build: - - runtime: golang:1.25.7-alpine3.23 - - runtime: mcr.microsoft.com/oss/go/microsoft/golang:1.25.7-bookworm + - runtime: golang:1.25.8-alpine3.23 + - runtime: mcr.microsoft.com/oss/go/microsoft/golang:1.25.8-bookworm runs-on: ubuntu-latest-8-cores steps: - name: Checkout diff --git a/.github/workflows/create_build_image.yml b/.github/workflows/create_build_image.yml index 7e9c41c755c..2b0d5225903 100644 --- a/.github/workflows/create_build_image.yml +++ b/.github/workflows/create_build_image.yml @@ -14,8 +14,8 @@ jobs: strategy: matrix: build: - - runtime: golang:1.25.7-alpine3.23 - - runtime: mcr.microsoft.com/oss/go/microsoft/golang:1.25.7-bookworm + - runtime: golang:1.25.8-alpine3.23 + - runtime: mcr.microsoft.com/oss/go/microsoft/golang:1.25.8-bookworm suffix: "-boringcrypto" runs-on: ubuntu-latest-8-cores steps: diff --git a/.github/workflows/publish-alloy-linux.yml b/.github/workflows/publish-alloy-linux.yml index 467b6096bf5..e52b20f0223 100644 --- a/.github/workflows/publish-alloy-linux.yml +++ b/.github/workflows/publish-alloy-linux.yml @@ -26,7 +26,7 @@ permissions: jobs: publish_linux_container: name: Publish Alloy Linux container - container: grafana/alloy-build-image:v0.1.28@sha256:982eb27dfc3111a3a81eb605d2e80d0c6c21a32842c2652b6390be6cd80da6fb + container: grafana/alloy-build-image:v0.1.29@sha256:2500d89efb3bc1cf0a94a00a197ec0f316cc409b7fc031a8de0f6092a782bdd6 runs-on: labels: github-hosted-ubuntu-x64-large permissions: diff --git a/.github/workflows/release-publish-alloy-artifacts.yml b/.github/workflows/release-publish-alloy-artifacts.yml index a911bc2e6bd..6b2990ea0e6 100644 --- a/.github/workflows/release-publish-alloy-artifacts.yml +++ b/.github/workflows/release-publish-alloy-artifacts.yml @@ -76,7 +76,7 @@ jobs: build_alloy: name: Build Alloy - container: grafana/alloy-build-image:v0.1.28@sha256:982eb27dfc3111a3a81eb605d2e80d0c6c21a32842c2652b6390be6cd80da6fb + container: grafana/alloy-build-image:v0.1.29@sha256:2500d89efb3bc1cf0a94a00a197ec0f316cc409b7fc031a8de0f6092a782bdd6 runs-on: labels: github-hosted-ubuntu-x64-large needs: @@ -156,7 +156,7 @@ jobs: build_alloy_windows_installer: name: Build Alloy Windows installer with signed executables - container: grafana/alloy-build-image:v0.1.28@sha256:982eb27dfc3111a3a81eb605d2e80d0c6c21a32842c2652b6390be6cd80da6fb + container: grafana/alloy-build-image:v0.1.29@sha256:2500d89efb3bc1cf0a94a00a197ec0f316cc409b7fc031a8de0f6092a782bdd6 runs-on: labels: github-hosted-ubuntu-x64-large needs: @@ -234,7 +234,7 @@ jobs: upload_release_artifacts: name: Upload release artifacts - container: grafana/alloy-build-image:v0.1.28@sha256:982eb27dfc3111a3a81eb605d2e80d0c6c21a32842c2652b6390be6cd80da6fb + container: grafana/alloy-build-image:v0.1.29@sha256:2500d89efb3bc1cf0a94a00a197ec0f316cc409b7fc031a8de0f6092a782bdd6 runs-on: labels: github-hosted-ubuntu-x64-large needs: diff --git a/.github/workflows/test_full.yml b/.github/workflows/test_full.yml index f582f38ec3f..705cb0fce18 100644 --- a/.github/workflows/test_full.yml +++ b/.github/workflows/test_full.yml @@ -15,7 +15,7 @@ jobs: name: Test (Full) runs-on: ubuntu-latest-8-cores container: - image: grafana/alloy-build-image:v0.1.28@sha256:982eb27dfc3111a3a81eb605d2e80d0c6c21a32842c2652b6390be6cd80da6fb + image: grafana/alloy-build-image:v0.1.29@sha256:2500d89efb3bc1cf0a94a00a197ec0f316cc409b7fc031a8de0f6092a782bdd6 volumes: - /var/run/docker.sock steps: diff --git a/.github/workflows/test_linux_system_packages.yml b/.github/workflows/test_linux_system_packages.yml index d200dd32c9d..909e42170e6 100644 --- a/.github/workflows/test_linux_system_packages.yml +++ b/.github/workflows/test_linux_system_packages.yml @@ -17,7 +17,7 @@ jobs: name: Test Linux system packages runs-on: ubuntu-latest container: - image: grafana/alloy-build-image:v0.1.28@sha256:982eb27dfc3111a3a81eb605d2e80d0c6c21a32842c2652b6390be6cd80da6fb + image: grafana/alloy-build-image:v0.1.29@sha256:2500d89efb3bc1cf0a94a00a197ec0f316cc409b7fc031a8de0f6092a782bdd6 volumes: - /var/run/docker.sock steps: diff --git a/Dockerfile b/Dockerfile index 5191fdf64df..6f4b34ef4cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -# syntax=docker/dockerfile:1.4 +# syntax=docker/dockerfile:1.21@sha256:27f9262d43452075f3c410287a2c43f5ef1bf7ec2bb06e8c9eeb1b8d453087bc # NOTE: This Dockerfile can only be built using BuildKit. BuildKit is used by # 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.28 AS ui-build +FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.29@sha256:2500d89efb3bc1cf0a94a00a197ec0f316cc409b7fc031a8de0f6092a782bdd6 AS ui-build ARG BUILDPLATFORM COPY ./internal/web/ui /ui WORKDIR /ui @@ -12,7 +12,7 @@ RUN --mount=type=cache,target=/ui/node_modules,sharing=locked \ npm install \ && npm run build -FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.28 AS build +FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.29@sha256:2500d89efb3bc1cf0a94a00a197ec0f316cc409b7fc031a8de0f6092a782bdd6 AS build ARG BUILDPLATFORM ARG TARGETPLATFORM @@ -39,7 +39,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ ### -FROM public.ecr.aws/ubuntu/ubuntu:noble +FROM public.ecr.aws/ubuntu/ubuntu:noble@sha256:b1940c8ecf8ff591053cc5db0303fb882f9fafec50f26892a870bcbe1b30d25a # Username and uid for alloy user ARG UID="473" diff --git a/Dockerfile.windows b/Dockerfile.windows index 8517fa6a496..fbcb1de46d4 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,5 +1,5 @@ -ARG BASE_IMAGE_GO=library/golang:1.24-windowsservercore-ltsc2022 -ARG BASE_IMAGE_WINDOWS=mcr.microsoft.com/windows/nanoserver:ltsc2022 +ARG BASE_IMAGE_GO=library/golang:1.26-windowsservercore-ltsc2022@sha256:8231fbb9b76c4acf94daf580a35ef5a64480e545aded8062fb29deaf456c145f +ARG BASE_IMAGE_WINDOWS=mcr.microsoft.com/windows/nanoserver:ltsc2022@sha256:60612a30303eb5a15ce7f53fa2eecf70bca41d72657de0482fbde601ae5f3403 FROM ${BASE_IMAGE_GO} AS builder diff --git a/collector/go.mod b/collector/go.mod index 6a5c4029fd9..b66f5825766 100644 --- a/collector/go.mod +++ b/collector/go.mod @@ -2,7 +2,7 @@ module github.com/grafana/alloy/otel_engine -go 1.25.7 +go 1.25.8 require ( github.com/grafana/alloy v0.0.0-00010101000000-000000000000 diff --git a/example/docker-compose/images/grizzly/Dockerfile b/example/docker-compose/images/grizzly/Dockerfile index 6a040c1625b..95f4e79bd15 100644 --- a/example/docker-compose/images/grizzly/Dockerfile +++ b/example/docker-compose/images/grizzly/Dockerfile @@ -1,3 +1,3 @@ -FROM golang:1.25.7-alpine +FROM golang:1.25.8-alpine@sha256:d4c4845f5d60c6a974c6000ce58ae079328d03ab7f721a0734277e69905473e5 RUN go install github.com/grafana/grizzly/cmd/grr@v0.7.1 diff --git a/example/docker-compose/images/jb/Dockerfile b/example/docker-compose/images/jb/Dockerfile index c89e20eaa79..dca65b4d979 100644 --- a/example/docker-compose/images/jb/Dockerfile +++ b/example/docker-compose/images/jb/Dockerfile @@ -1,3 +1,3 @@ -FROM golang:1.25.7-alpine +FROM golang:1.25.8-alpine@sha256:d4c4845f5d60c6a974c6000ce58ae079328d03ab7f721a0734277e69905473e5 RUN go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@v0.5.1 diff --git a/extension/alloyengine/go.mod b/extension/alloyengine/go.mod index 274e5643d44..603df023ad2 100644 --- a/extension/alloyengine/go.mod +++ b/extension/alloyengine/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/alloy/extension/alloyengine -go 1.25.7 +go 1.25.8 replace github.com/grafana/alloy => ../.. diff --git a/go.mod b/go.mod index 459ba636fc3..bf1cdac8f9e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/alloy -go 1.25.7 +go 1.25.8 // 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. diff --git a/integration-tests/docker/configs/kafka/Dockerfile b/integration-tests/docker/configs/kafka/Dockerfile index 695d6735e4f..70b5c6e177f 100644 --- a/integration-tests/docker/configs/kafka/Dockerfile +++ b/integration-tests/docker/configs/kafka/Dockerfile @@ -1,10 +1,10 @@ -FROM golang:1.25.7 as build +FROM golang:1.25.8@sha256:c83e68f3ebb6943a2904fa66348867d108119890a2c6a2e6f07b38d0eb6c25c5 as build WORKDIR /app/ COPY go.mod go.sum ./ COPY syntax/go.mod syntax/go.sum ./syntax/ RUN go mod download COPY ./integration-tests/docker/configs/kafka/ ./ RUN CGO_ENABLED=0 go build -o main main.go -FROM alpine:3.18 +FROM alpine:3.23@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659 COPY --from=build /app/main /app/main CMD ["/app/main"] diff --git a/integration-tests/docker/configs/otel-gen/Dockerfile b/integration-tests/docker/configs/otel-gen/Dockerfile index f9a243cbd16..33a1bc4cb43 100644 --- a/integration-tests/docker/configs/otel-gen/Dockerfile +++ b/integration-tests/docker/configs/otel-gen/Dockerfile @@ -1,10 +1,10 @@ -FROM golang:1.25.7 as build +FROM golang:1.25.8@sha256:c83e68f3ebb6943a2904fa66348867d108119890a2c6a2e6f07b38d0eb6c25c5 as build WORKDIR /app/ COPY go.mod go.sum ./ COPY syntax/go.mod syntax/go.sum ./syntax/ RUN go mod download COPY ./integration-tests/docker/configs/otel-gen/ ./ RUN CGO_ENABLED=0 go build -o main main.go -FROM alpine:3.18 +FROM alpine:3.23@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659 COPY --from=build /app/main /app/main CMD ["/app/main"] diff --git a/integration-tests/docker/configs/prom-gen/Dockerfile b/integration-tests/docker/configs/prom-gen/Dockerfile index fa863766eb8..7b15f939321 100644 --- a/integration-tests/docker/configs/prom-gen/Dockerfile +++ b/integration-tests/docker/configs/prom-gen/Dockerfile @@ -1,10 +1,10 @@ -FROM golang:1.25.7 as build +FROM golang:1.25.8@sha256:c83e68f3ebb6943a2904fa66348867d108119890a2c6a2e6f07b38d0eb6c25c5 as build WORKDIR /app/ COPY go.mod go.sum ./ COPY syntax/go.mod syntax/go.sum ./syntax/ RUN go mod download COPY ./integration-tests/docker/configs/prom-gen/ ./ RUN CGO_ENABLED=0 go build -o main main.go -FROM alpine:3.18 +FROM alpine:3.23@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659 COPY --from=build /app/main /app/main CMD ["/app/main"] diff --git a/internal/tools/packaging_test/testdata/centos-systemd.Dockerfile b/internal/tools/packaging_test/testdata/centos-systemd.Dockerfile index 7b12ab3bb64..fce5c4a327f 100644 --- a/internal/tools/packaging_test/testdata/centos-systemd.Dockerfile +++ b/internal/tools/packaging_test/testdata/centos-systemd.Dockerfile @@ -1,6 +1,6 @@ # Build a CentOS image with systemd configured to test RPM package installation. # See the `test-packages` make target and associated script for how this image is used. -FROM centos:8 +FROM centos:8@sha256:a27fd8080b517143cbbbab9dfb7c8571c40d67d534bbdee55bd6c473f432b177 ENV container docker RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \ systemd-tmpfiles-setup.service ] || rm -f $i; done); \ diff --git a/internal/tools/packaging_test/testdata/debian-systemd.Dockerfile b/internal/tools/packaging_test/testdata/debian-systemd.Dockerfile index 2dccd6c2d9c..d339d05c5bc 100644 --- a/internal/tools/packaging_test/testdata/debian-systemd.Dockerfile +++ b/internal/tools/packaging_test/testdata/debian-systemd.Dockerfile @@ -1,6 +1,6 @@ # Build a Debian image with systemd configured to test deb package installation. # See the `test-packages` make target and associated script for how this image is used. -FROM debian:10 +FROM debian:10@sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 ENV container docker ENV LC_ALL C ENV DEBIAN_FRONTEND noninteractive diff --git a/syntax/go.mod b/syntax/go.mod index 566f5f678c8..fe068b1b041 100644 --- a/syntax/go.mod +++ b/syntax/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/alloy/syntax -go 1.25.7 +go 1.25.8 require ( github.com/blang/semver/v4 v4.0.0 diff --git a/tools/build-image/Dockerfile b/tools/build-image/Dockerfile index bdbfbdab1e4..2375f00ed32 100644 --- a/tools/build-image/Dockerfile +++ b/tools/build-image/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.4 +# syntax=docker/dockerfile:1.21@sha256:27f9262d43452075f3c410287a2c43f5ef1bf7ec2bb06e8c9eeb1b8d453087bc # NOTE: This Dockerfile can only be built using BuildKit. BuildKit is used by # default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set @@ -15,18 +15,18 @@ ARG GO_RUNTIME=mustoverride # # Dependency: docker (for building images) -FROM alpine:3.23 as docker +FROM alpine:3.23@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659 as docker RUN apk add --no-cache docker-cli docker-cli-buildx # Dependency: helm -FROM alpine:3.23 as helm +FROM alpine:3.23@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659 as helm RUN apk add --no-cache helm # Dependency: nsis (for building Windows installers) # TODO: Use nsis with conda so that we don't have to pull those packages from the internet. # https://nsis.sourceforge.io/Conda # TODO: Why do we use i386? Is it correct? -FROM alpine:3.23 as nsis +FROM alpine:3.23@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659 as nsis RUN wget -nv https://nsis.sourceforge.io/mediawiki/images/4/4a/AccessControl.zip \ && unzip AccessControl.zip -d /usr/share/nsis/ \ && mkdir -p /usr/share/nsis/Plugins/x86-unicode \ @@ -55,7 +55,7 @@ RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@$CONTROLLER_GEN_V # rfratto/viceroy contains C cross compilers can be used for our Cgo # dependencies. -FROM rfratto/viceroy:v0.4.0 +FROM rfratto/viceroy:v0.4.0@sha256:7e3f328889b5b0c5c0303dda5e74a89189e6e437d33f609dde98f9a84337e0a2 # Fix apt sources - restrict main bullseye to supported architectures RUN rm -f /etc/apt/sources.list \ diff --git a/tools/build-image/windows/Dockerfile b/tools/build-image/windows/Dockerfile index 0575e814011..d02c62cf6c4 100644 --- a/tools/build-image/windows/Dockerfile +++ b/tools/build-image/windows/Dockerfile @@ -1,4 +1,4 @@ -FROM library/golang:1.25.7-windowsservercore-ltsc2022 +FROM library/golang:1.25.8-windowsservercore-ltsc2022@sha256:8231fbb9b76c4acf94daf580a35ef5a64480e545aded8062fb29deaf456c145f SHELL ["powershell", "-command"] diff --git a/tools/generate-module-dependencies/go.mod b/tools/generate-module-dependencies/go.mod index c55d10d01af..c3e6f520cc1 100644 --- a/tools/generate-module-dependencies/go.mod +++ b/tools/generate-module-dependencies/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/replace-generator -go 1.25.7 +go 1.25.8 require gopkg.in/yaml.v3 v3.0.1 diff --git a/tools/go.mod b/tools/go.mod index c0bc7239e79..c9a08ae4615 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/alloy/tools -go 1.25.7 +go 1.25.8 require ( github.com/google/go-github/v57 v57.0.0