diff --git a/.drone/drone.yml b/.drone/drone.yml index 0fefeb17a745..b2505176ac6f 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -126,7 +126,7 @@ steps: - commands: - apt-get update -y && apt-get install -y libsystemd-dev - make lint - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Lint trigger: event: @@ -144,7 +144,7 @@ steps: - ERR_MSG="Dashboard definitions are out of date. Please run 'make generate-dashboards' and commit changes!" - if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Regenerate dashboards trigger: event: @@ -162,7 +162,7 @@ steps: - ERR_MSG="Custom Resource Definitions are out of date. Please run 'make generate-crds' and commit changes!" - if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Regenerate crds trigger: event: @@ -180,7 +180,7 @@ steps: - ERR_MSG="The environment manifests are out of date. Please run 'make generate-manifests' and commit changes!" - if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Regenerate environment manifests trigger: event: @@ -195,7 +195,7 @@ platform: steps: - commands: - make GO_TAGS="nodocker" test - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Run Go tests trigger: event: @@ -210,7 +210,7 @@ platform: steps: - commands: - K8S_USE_DOCKER_NETWORK=1 make test - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Run Go tests volumes: - name: docker @@ -233,7 +233,7 @@ platform: steps: - commands: - go test -tags="nodocker,nonetwork" ./... - image: grafana/agent-build-image:0.30.2-windows + image: grafana/agent-build-image:0.30.3-windows name: Run Go tests trigger: ref: @@ -248,7 +248,7 @@ platform: steps: - commands: - make agent-image - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build container volumes: - name: docker @@ -273,7 +273,7 @@ platform: steps: - commands: - make agentctl-image - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build container volumes: - name: docker @@ -298,7 +298,7 @@ platform: steps: - commands: - make operator-image - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build container volumes: - name: docker @@ -324,7 +324,7 @@ platform: steps: - commands: - '& "C:/Program Files/git/bin/bash.exe" ./tools/ci/docker-containers-windows agent' - image: grafana/agent-build-image:0.30.2-windows + image: grafana/agent-build-image:0.30.3-windows name: Build container volumes: - name: docker @@ -350,7 +350,7 @@ platform: steps: - commands: - '& "C:/Program Files/git/bin/bash.exe" ./tools/ci/docker-containers-windows agentctl' - image: grafana/agent-build-image:0.30.2-windows + image: grafana/agent-build-image:0.30.3-windows name: Build container volumes: - name: docker @@ -377,7 +377,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM= make agent - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -394,7 +394,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM= make agent - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -411,7 +411,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM= make agent - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -428,7 +428,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM= make agent - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -444,7 +444,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make agent - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -460,7 +460,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make agent - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -476,7 +476,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make agent - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -492,7 +492,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make agent - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -509,7 +509,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM= make agent-flow - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -526,7 +526,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM= make agent-flow - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -543,7 +543,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM= make agent-flow - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -560,7 +560,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM= make agent-flow - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -576,7 +576,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make agent-flow - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -592,7 +592,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make agent-flow - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -608,7 +608,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make agent-flow - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -624,7 +624,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make agent-flow - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -641,7 +641,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM= make agentctl - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -658,7 +658,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM= make agentctl - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -675,7 +675,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM= make agentctl - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -692,7 +692,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM= make agentctl - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -708,7 +708,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make agentctl - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -724,7 +724,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make agentctl - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -740,7 +740,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make agentctl - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -756,7 +756,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make agentctl - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -773,7 +773,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM= make operator - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -790,7 +790,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM= make operator - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -807,7 +807,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM= make operator - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -824,7 +824,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM= make operator - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -840,7 +840,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make operator - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -856,7 +856,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make operator - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -872,7 +872,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make operator - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -888,7 +888,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make operator - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -905,7 +905,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM= GOEXPERIMENT=boringcrypto make agent-boringcrypto - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -922,7 +922,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM= GOEXPERIMENT=boringcrypto make agent-boringcrypto - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Build trigger: event: @@ -938,7 +938,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Configure QEMU volumes: - name: docker @@ -958,7 +958,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Publish container volumes: - name: docker @@ -982,7 +982,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Configure QEMU volumes: - name: docker @@ -1002,7 +1002,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Publish container volumes: - name: docker @@ -1026,7 +1026,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Configure QEMU volumes: - name: docker @@ -1046,7 +1046,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Publish container volumes: - name: docker @@ -1070,7 +1070,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Configure QEMU volumes: - name: docker @@ -1090,7 +1090,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Publish container volumes: - name: docker @@ -1114,7 +1114,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Configure QEMU volumes: - name: docker @@ -1134,7 +1134,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Publish container volumes: - name: docker @@ -1158,7 +1158,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Configure QEMU volumes: - name: docker @@ -1178,7 +1178,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Publish container volumes: - name: docker @@ -1207,7 +1207,7 @@ steps: from_secret: docker_login DOCKER_PASSWORD: from_secret: docker_password - image: grafana/agent-build-image:0.30.2-windows + image: grafana/agent-build-image:0.30.3-windows name: Build containers volumes: - name: docker @@ -1236,7 +1236,7 @@ steps: from_secret: docker_login DOCKER_PASSWORD: from_secret: docker_password - image: grafana/agent-build-image:0.30.2-windows + image: grafana/agent-build-image:0.30.3-windows name: Build containers volumes: - name: docker @@ -1357,7 +1357,7 @@ steps: from_secret: gpg_private_key GPG_PUBLIC_KEY: from_secret: gpg_public_key - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Publish release volumes: - name: docker @@ -1382,7 +1382,7 @@ steps: - DOCKER_OPTS="" make dist/grafana-agentctl-linux-amd64 - DOCKER_OPTS="" make dist.temp/grafana-agent-flow-linux-amd64 - DOCKER_OPTS="" make test-packages - image: grafana/agent-build-image:0.30.2 + image: grafana/agent-build-image:0.30.3 name: Test Linux system packages volumes: - name: docker @@ -1478,6 +1478,6 @@ kind: secret name: updater_private_key --- kind: signature -hmac: d9fd1e02c62a58f2f6ccd7c87108f53d0a701dd5d44e81366ff825edb9401ae6 +hmac: f0a76b1eb8a86fd7cd800855df42655a2bd799d35b505acea3b722ff5644ba5d ... diff --git a/cmd/grafana-agent-operator/Dockerfile b/cmd/grafana-agent-operator/Dockerfile index 8a76dd3f1162..1b797fc96d69 100644 --- a/cmd/grafana-agent-operator/Dockerfile +++ b/cmd/grafana-agent-operator/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/agent-build-image:0.30.2 as build +FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.30.3 as build ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/cmd/grafana-agent/Dockerfile b/cmd/grafana-agent/Dockerfile index 178abb736e69..f03bd4efdfd0 100644 --- a/cmd/grafana-agent/Dockerfile +++ b/cmd/grafana-agent/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/agent-build-image:0.30.2 as build +FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.30.3 as build ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/cmd/grafana-agent/Dockerfile.windows b/cmd/grafana-agent/Dockerfile.windows index 1670dc036068..cd2bd529f942 100644 --- a/cmd/grafana-agent/Dockerfile.windows +++ b/cmd/grafana-agent/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM grafana/agent-build-image:0.30.2-windows as builder +FROM grafana/agent-build-image:0.30.3-windows as builder ARG VERSION ARG RELEASE_BUILD=1 diff --git a/cmd/grafana-agentctl/Dockerfile b/cmd/grafana-agentctl/Dockerfile index 8ac72875b42d..5a024889e664 100644 --- a/cmd/grafana-agentctl/Dockerfile +++ b/cmd/grafana-agentctl/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/agent-build-image:0.30.2 as build +FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.30.3 as build ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/cmd/grafana-agentctl/Dockerfile.windows b/cmd/grafana-agentctl/Dockerfile.windows index b1336e0379fe..f310fa1af798 100644 --- a/cmd/grafana-agentctl/Dockerfile.windows +++ b/cmd/grafana-agentctl/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM grafana/agent-build-image:0.30.2-windows as builder +FROM grafana/agent-build-image:0.30.3-windows as builder ARG VERSION ARG RELEASE_BUILD=1 diff --git a/tools/crow/Dockerfile b/tools/crow/Dockerfile index 11ff7f62bb29..2e167ab9d2f6 100644 --- a/tools/crow/Dockerfile +++ b/tools/crow/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/agent-build-image:0.30.2 as build +FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.30.3 as build ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/tools/make/build-container.mk b/tools/make/build-container.mk index aec36120c173..ae67dbe8a3e3 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 ?= 0.30.2 +BUILD_IMAGE_VERSION ?= 0.30.3 BUILD_IMAGE ?= grafana/agent-build-image:$(BUILD_IMAGE_VERSION) DOCKER_OPTS ?= -it diff --git a/tools/smoke/Dockerfile b/tools/smoke/Dockerfile index 503c9ebe8809..aed61b57dede 100644 --- a/tools/smoke/Dockerfile +++ b/tools/smoke/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/agent-build-image:0.30.2 as build +FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.30.3 as build ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS