diff --git a/.drone/drone.yml b/.drone/drone.yml index ad506fa51b..b110e802ca 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -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.0 + image: grafana/alloy-build-image:v0.1.1 name: Lint trigger: event: @@ -125,7 +125,7 @@ platform: steps: - commands: - make GO_TAGS="nodocker" test - image: grafana/alloy-build-image:v0.1.0 + image: grafana/alloy-build-image:v0.1.1 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.0 + image: grafana/alloy-build-image:v0.1.1 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.0-windows + image: grafana/alloy-build-image:v0.1.1-windows name: Run Go tests trigger: ref: @@ -178,7 +178,7 @@ platform: steps: - commands: - make alloy-image - image: grafana/alloy-build-image:v0.1.0 + image: grafana/alloy-build-image:v0.1.1 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.0-windows + image: grafana/alloy-build-image:v0.1.1-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.0 + image: grafana/alloy-build-image:v0.1.1 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.0 + image: grafana/alloy-build-image:v0.1.1 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.0 + image: grafana/alloy-build-image:v0.1.1 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.0 + image: grafana/alloy-build-image:v0.1.1 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.0 + image: grafana/alloy-build-image:v0.1.1 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.0 + image: grafana/alloy-build-image:v0.1.1 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.0 + image: grafana/alloy-build-image:v0.1.1 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.0 + image: grafana/alloy-build-image:v0.1.1 name: Build trigger: event: @@ -362,7 +362,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.0 + image: grafana/alloy-build-image:v0.1.1 name: Configure QEMU volumes: - name: docker @@ -382,7 +382,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.0 + image: grafana/alloy-build-image:v0.1.1 name: Publish container volumes: - name: docker @@ -405,7 +405,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.0 + image: grafana/alloy-build-image:v0.1.1 name: Configure QEMU volumes: - name: docker @@ -425,7 +425,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.0 + image: grafana/alloy-build-image:v0.1.1 name: Publish container 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.0-windows + image: grafana/alloy-build-image:v0.1.1-windows name: Build containers 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.0-windows + image: grafana/alloy-build-image:v0.1.1-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.0 + image: grafana/alloy-build-image:v0.1.1 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.0 + image: grafana/alloy-build-image:v0.1.1 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.0 + image: grafana/alloy-build-image:v0.1.1 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.0 + image: grafana/alloy-build-image:v0.1.1 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.0-windows + image: grafana/alloy-build-image:v0.1.1-windows name: Build containers volumes: - name: docker @@ -647,7 +647,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.0-windows + image: grafana/alloy-build-image:v0.1.1-windows name: Build containers volumes: - name: docker @@ -749,7 +749,7 @@ steps: from_secret: gpg_private_key GPG_PUBLIC_KEY: from_secret: gpg_public_key - image: grafana/alloy-build-image:v0.1.0 + image: grafana/alloy-build-image:v0.1.1 name: Publish release volumes: - name: docker @@ -772,7 +772,7 @@ steps: - commands: - DOCKER_OPTS="" make dist/alloy-linux-amd64 - DOCKER_OPTS="" make test-packages - image: grafana/alloy-build-image:v0.1.0 + image: grafana/alloy-build-image:v0.1.1 name: Test Linux system packages volumes: - name: docker @@ -870,6 +870,6 @@ kind: secret name: updater_private_key --- kind: signature -hmac: 90256fa94151ede8f87febe3f321163c743775ccef301a37bec5a8a7ca5376f9 +hmac: 014e46cefcbc28d6d6b5221c2bb477dd9f48bfb6c2fbbf0344e1d1ffef458ca4 ... diff --git a/CHANGELOG.md b/CHANGELOG.md index 2df9337a99..f8cbdb423c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -156,6 +156,8 @@ v1.1.0-rc.0 - `otelcol.processor.resourcedetection`: Update to ec2 scraper so that core attributes are not dropped if describeTags returns an error (likely due to permissions). https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/30672 +- Use Go 1.22.3 for builds. (@kminehart) + v1.0.0 ------ diff --git a/Dockerfile b/Dockerfile index aa83dad5ec..7e27c8a532 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.0 as build +FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.1 as build ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/Dockerfile.windows b/Dockerfile.windows index 4449eaaba0..7a123bb060 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM grafana/alloy-build-image:v0.1.0-windows as builder +FROM grafana/alloy-build-image:v0.1.1-windows as builder ARG VERSION ARG RELEASE_BUILD=1 ARG GO_TAGS diff --git a/tools/make/build-container.mk b/tools/make/build-container.mk index 37bfe755d3..9d0ee1ee5c 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.0 +BUILD_IMAGE_VERSION ?= v0.1.1 BUILD_IMAGE ?= grafana/alloy-build-image:$(BUILD_IMAGE_VERSION) DOCKER_OPTS ?= -it