Skip to content

Commit

Permalink
Bump usage of build image to v0.30.1 (#5112)
Browse files Browse the repository at this point in the history
* bump usage of build image to build-image/v0.30.1

* .golangci.yml: update depguard to new configuration settings
  • Loading branch information
rfratto authored Sep 6, 2023
1 parent 6991ff2 commit b09fa0b
Show file tree
Hide file tree
Showing 10 changed files with 82 additions and 79 deletions.
126 changes: 63 additions & 63 deletions .drone/drone.yml

Large diffs are not rendered by default.

19 changes: 11 additions & 8 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,17 @@ issues:
# Linter settings options: https://golangci-lint.run/usage/linters/
linters-settings:
depguard:
# We want to report errors on stdlib packages, not just third party modules
include-go-root: true

packages-with-error-message:
- sync/atomic: "Use go.uber.org/atomic instead of sync/atomic"
- github.com/pkg/errors: "Use errors instead of github.com/pkg/errors"
- github.com/go-kit/kit/log: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log"
- golang.org/x/sync/errgroup: "Use github.com/oklog/run instead of golang.org/x/sync/errgroup"
rules:
main:
deny:
- pkg: "sync/atomic"
desc: Use go.uber.org/atomic instead of sync/atomic
- pkg: "github.com/pkg/errors"
desc: Use errors instead of github.com/pkg/errors
- pkg: "github.com/go-kit/kit/log"
desc: Use github.com/go-kit/log instead of github.com/go-kit/kit/log
- pkg: "golang.org/x/sync/errgroup"
desc: Use github.com/oklog/run instead of golang.org/x/sync/errgroup

whitespace:
# While there normally shouldn't be extra redundant leading/trailing
Expand Down
2 changes: 1 addition & 1 deletion cmd/grafana-agent-operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.0 as build
FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.30.1 as build
ARG BUILDPLATFORM
ARG TARGETPLATFORM
ARG TARGETOS
Expand Down
2 changes: 1 addition & 1 deletion cmd/grafana-agent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.0 as build
FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.30.1 as build
ARG BUILDPLATFORM
ARG TARGETPLATFORM
ARG TARGETOS
Expand Down
2 changes: 1 addition & 1 deletion cmd/grafana-agent/Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM grafana/agent-build-image:0.30.0-windows as builder
FROM grafana/agent-build-image:0.30.1-windows as builder
ARG VERSION
ARG RELEASE_BUILD=1

Expand Down
2 changes: 1 addition & 1 deletion cmd/grafana-agentctl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.0 as build
FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.30.1 as build
ARG BUILDPLATFORM
ARG TARGETPLATFORM
ARG TARGETOS
Expand Down
2 changes: 1 addition & 1 deletion cmd/grafana-agentctl/Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM grafana/agent-build-image:0.30.0-windows as builder
FROM grafana/agent-build-image:0.30.1-windows as builder
ARG VERSION
ARG RELEASE_BUILD=1

Expand Down
2 changes: 1 addition & 1 deletion tools/crow/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.0 as build
FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.30.1 as build
ARG BUILDPLATFORM
ARG TARGETPLATFORM
ARG TARGETOS
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 ?= 0.30.0
BUILD_IMAGE_VERSION ?= 0.30.1
BUILD_IMAGE ?= grafana/agent-build-image:$(BUILD_IMAGE_VERSION)
DOCKER_OPTS ?= -it

Expand Down
2 changes: 1 addition & 1 deletion tools/smoke/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.0 as build
FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.30.1 as build
ARG BUILDPLATFORM
ARG TARGETPLATFORM
ARG TARGETOS
Expand Down

0 comments on commit b09fa0b

Please sign in to comment.