Skip to content

Commit

Permalink
update agent-build-image for go 1.17 (#1287)
Browse files Browse the repository at this point in the history
(also use a consistent base image tag instead of latest)
  • Loading branch information
rfratto committed Jan 19, 2022
1 parent 8fc3423 commit b890ef9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ CROSS_BUILD ?= false
# run make BUILD_IN_CONTAINER=false <target>, or you can set BUILD_IN_CONTAINER=true
# as an environment variable.
BUILD_IN_CONTAINER ?= true
BUILD_IMAGE_VERSION := 0.12.0
BUILD_IMAGE_VERSION := 0.13.0
BUILD_IMAGE := $(IMAGE_PREFIX)/agent-build-image:$(BUILD_IMAGE_VERSION)

# Enables the binary to be built with optimizations (i.e., doesn't strip the image of
Expand Down
7 changes: 4 additions & 3 deletions build-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Use the loki-build-image as a base as it shares most of the common tooling. We just need some additional tooling for building packages.
FROM grafana/loki-build-image
# Use the loki-build-image as a base as it shares most of the common tooling.
# We just need some additional tooling for building packages.
FROM grafana/loki-build-image:0.18.0

RUN apt-get update && apt-get install -y \
build-essential \
Expand All @@ -12,7 +13,7 @@ RUN apt-get update && apt-get install -y \

# Install dependencies used for the operator
# Keep versions in sync with cmd/agent-operator/DEVELOPERS.md
RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2
RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0

# Fix permissions for /go/bin directory.
RUN chmod 0755 /go/bin
Expand Down

0 comments on commit b890ef9

Please sign in to comment.