diff --git a/.drone/drone.yml b/.drone/drone.yml index cd95e4c248..7aa262125d 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -10,7 +10,7 @@ steps: - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - docker buildx create --name multiarch --driver docker-container --use - - docker buildx build --build-arg="GO_RUNTIME=golang:1.23.1-bullseye" --push --platform + - docker buildx build --build-arg="GO_RUNTIME=golang:1.22.7-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image environment: DOCKER_LOGIN: @@ -44,7 +44,7 @@ steps: - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - docker buildx create --name multiarch --driver docker-container --use - - docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye" + - docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.7-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image environment: @@ -110,7 +110,7 @@ steps: - commands: - apt-get update -y && apt-get install -y libsystemd-dev - make lint - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Lint trigger: event: @@ -125,7 +125,7 @@ platform: steps: - commands: - make GO_TAGS="nodocker" test - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Run Go tests trigger: event: @@ -140,7 +140,7 @@ platform: steps: - commands: - K8S_USE_DOCKER_NETWORK=1 make test - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Run Go tests volumes: - name: docker @@ -163,7 +163,7 @@ platform: steps: - commands: - go test -tags="nodocker,nonetwork" ./... - image: grafana/alloy-build-image:v0.1.3-windows + image: grafana/alloy-build-image:v0.1.6-windows name: Run Go tests trigger: ref: @@ -178,7 +178,7 @@ platform: steps: - commands: - make alloy-image - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build container volumes: - name: docker @@ -204,7 +204,7 @@ platform: steps: - commands: - '& "C:/Program Files/git/bin/bash.exe" -c "make alloy-image-windows"' - image: grafana/alloy-build-image:v0.1.3-windows + image: grafana/alloy-build-image:v0.1.6-windows name: Build container volumes: - name: docker @@ -231,7 +231,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -248,7 +248,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -265,7 +265,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM= make alloy - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -282,7 +282,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM= make alloy - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -298,7 +298,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -314,7 +314,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -330,7 +330,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -346,7 +346,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -363,7 +363,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM= GOEXPERIMENT=boringcrypto make alloy - image: grafana/alloy-build-image:v0.1.3-boringcrypto + image: grafana/alloy-build-image:v0.1.6-boringcrypto name: Build trigger: event: @@ -380,7 +380,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM= GOEXPERIMENT=boringcrypto make alloy - image: grafana/alloy-build-image:v0.1.3-boringcrypto + image: grafana/alloy-build-image:v0.1.6-boringcrypto name: Build trigger: event: @@ -396,7 +396,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Configure QEMU volumes: - name: docker @@ -416,7 +416,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Publish container volumes: - name: docker @@ -439,7 +439,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Configure QEMU volumes: - name: docker @@ -459,7 +459,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Publish container volumes: - name: docker @@ -493,7 +493,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.3-windows + image: grafana/alloy-build-image:v0.1.6-windows name: Build containers volumes: - name: docker @@ -516,7 +516,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Configure QEMU volumes: - name: docker @@ -536,7 +536,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Publish container volumes: - name: docker @@ -559,7 +559,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Configure QEMU volumes: - name: docker @@ -579,7 +579,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Publish container volumes: - name: docker @@ -613,7 +613,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.3-windows + image: grafana/alloy-build-image:v0.1.6-windows name: Build containers volumes: - name: docker @@ -714,7 +714,7 @@ steps: from_secret: gpg_private_key GPG_PUBLIC_KEY: from_secret: gpg_public_key - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Publish release volumes: - name: docker @@ -737,7 +737,7 @@ steps: - commands: - DOCKER_OPTS="" make dist/alloy-linux-amd64 - DOCKER_OPTS="" make test-packages - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Test Linux system packages volumes: - name: docker @@ -835,6 +835,6 @@ kind: secret name: updater_private_key --- kind: signature -hmac: d897b4d4c0e2b92087e4eab9ca27b1dbbe2f475172109656ad2d842cb4a5b945 +hmac: 353fac6e335a14f055d7e7a43b4d40517a1b5e28b3b3ad4d4e68df82b7f013b9 ... diff --git a/.drone/pipelines/build_images.jsonnet b/.drone/pipelines/build_images.jsonnet index d1ca1abee9..d8a90562ce 100644 --- a/.drone/pipelines/build_images.jsonnet +++ b/.drone/pipelines/build_images.jsonnet @@ -32,7 +32,7 @@ local locals = { 'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD', 'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes', 'docker buildx create --name multiarch --driver docker-container --use', - 'docker buildx build --build-arg="GO_RUNTIME=golang:1.23.1-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image', + 'docker buildx build --build-arg="GO_RUNTIME=golang:1.22.7-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image', ], }], volumes: [{ @@ -55,7 +55,7 @@ local locals = { 'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD', 'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes', 'docker buildx create --name multiarch --driver docker-container --use', - 'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image', + 'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.7-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image', ], }], volumes: [{ diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml index 1f9649dd26..8c1bf29074 100644 --- a/.github/workflows/check-linux-build-image.yml +++ b/.github/workflows/check-linux-build-image.yml @@ -25,7 +25,7 @@ jobs: push: false tags: grafana/alloy-build-image:latest build-args: | - GO_RUNTIME=golang:1.23.1-bullseye + GO_RUNTIME=golang:1.22.7-bullseye - name: Create test Linux build image for boring crypto uses: docker/build-push-action@v6 @@ -34,4 +34,4 @@ jobs: push: false tags: grafana/alloy-build-image:latest build-args: | - GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye + GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.7-bullseye diff --git a/Dockerfile b/Dockerfile index 8a021071f1..0eb3f1fac6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # 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.3 as build +FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.6 as build ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/Dockerfile.windows b/Dockerfile.windows index cdb1a5d6cb..d5066c02d5 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM grafana/alloy-build-image:v0.1.3-windows as builder +FROM grafana/alloy-build-image:v0.1.6-windows as builder ARG VERSION ARG RELEASE_BUILD=1 ARG GO_TAGS diff --git a/internal/etc/datadogreceiver/go.mod b/internal/etc/datadogreceiver/go.mod index e4df30f7e1..0cfe8d1a5c 100644 --- a/internal/etc/datadogreceiver/go.mod +++ b/internal/etc/datadogreceiver/go.mod @@ -1,6 +1,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver -go 1.22.5 +go 1.22.7 require ( github.com/DataDog/agent-payload/v5 v5.0.115 diff --git a/tools/build-image/Dockerfile b/tools/build-image/Dockerfile index e44abc1333..d8b3f7ec6f 100644 --- a/tools/build-image/Dockerfile +++ b/tools/build-image/Dockerfile @@ -4,7 +4,7 @@ # default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set # in environment variables. -# NOTE: The GO_RUNTIME is used to switch between the default Google go runtime and mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye which is a Microsoft +# NOTE: The GO_RUNTIME is used to switch between the default Google go runtime and mcr.microsoft.com/oss/go/microsoft/golang:1.22.7-bullseye which is a Microsoft # 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 ARG GO_RUNTIME=mustoverride diff --git a/tools/build-image/windows/Dockerfile b/tools/build-image/windows/Dockerfile index b352145bea..99625c27f6 100644 --- a/tools/build-image/windows/Dockerfile +++ b/tools/build-image/windows/Dockerfile @@ -1,4 +1,4 @@ -FROM library/golang:1.23.1-windowsservercore-1809 +FROM library/golang:1.22.7-windowsservercore-1809 SHELL ["powershell", "-command"] diff --git a/tools/make/build-container.mk b/tools/make/build-container.mk index 9c92bd45a4..96d681a7ba 100644 --- a/tools/make/build-container.mk +++ b/tools/make/build-container.mk @@ -34,7 +34,7 @@ # variable names should be passed through to the container. USE_CONTAINER ?= 0 -BUILD_IMAGE_VERSION ?= v0.1.3 +BUILD_IMAGE_VERSION ?= v0.1.6 BUILD_IMAGE ?= grafana/alloy-build-image:$(BUILD_IMAGE_VERSION) DOCKER_OPTS ?= -it