Skip to content

Commit c4c6f2a

Browse files
authored
Fixing image build and adding image building to test runs (#502)
1 parent bbc0a90 commit c4c6f2a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dockerfile has specific requirement to put this ARG at the beginning:
22
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
3-
ARG BUILDER_IMAGE=golang:1.23
3+
ARG BUILDER_IMAGE=golang:1.24
44
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot
55

66
## Multistage build

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ BBR_IMAGE_REPO ?= $(IMAGE_REGISTRY)/$(BBR_IMAGE_NAME)
4444
BBR_IMAGE_TAG ?= $(BBR_IMAGE_REPO):$(GIT_TAG)
4545

4646
BASE_IMAGE ?= gcr.io/distroless/static:nonroot
47-
BUILDER_IMAGE ?= golang:1.23
47+
BUILDER_IMAGE ?= golang:1.24
4848
ifdef GO_VERSION
4949
BUILDER_IMAGE = golang:$(GO_VERSION)
5050
endif
@@ -120,7 +120,7 @@ vet: ## Run go vet against code.
120120
go vet ./...
121121

122122
.PHONY: test
123-
test: manifests generate fmt vet envtest ## Run tests.
123+
test: manifests generate fmt vet envtest image-build ## Run tests.
124124
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e) -race -coverprofile cover.out
125125

126126
.PHONY: test-integration

0 commit comments

Comments
 (0)