From de7e8230aec47b1346d28a2e5a35fe884b528d3d Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Thu, 22 Feb 2024 00:16:49 +0100
Subject: [PATCH] make: simplify personal docker builds

```
PLATFORMS=linux/whatever make docker-build
```

now lets you more easily choose a selection of platforms to build.

You can also push with

BUILDX_ACTION=--push make docker-build

This is advantageous over `docker-build` + `docker-push` if you build
using remote hosts, as you avoid pulling the image back to your local
machine.

And when you use a personal repo/registry for developing in clusters you
can maintain the default tag by only overriding `IMG_REPO`.

```
IMG_REPO=rg.fr-par.scw.cloud/dlancashire-public/spin-operator-dev make docker-build-and-publish-all
```

Signed-off-by: Danielle Lancashire <dani@builds.terrible.systems>
---
 Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index d920bcce..2ccdb75f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ PKG_LDFLAGS           := github.com/prometheus/common/version
 LDFLAGS               := -s -w -X ${PKG_LDFLAGS}.Version=${VERSION} -X ${PKG_LDFLAGS}.Revision=${COMMIT} -X ${PKG_LDFLAGS}.BuildDate=${DATE} -X ${PKG_LDFLAGS}.Branch=${BRANCH}
 
 # Image URL to use all building/pushing image targets
-DEFAULT_IMG_REPO := ghcr.io/spinkube/spin-operator
-IMG ?= $(DEFAULT_IMG_REPO):$(shell git rev-parse --short HEAD)-dev
+IMG_REPO ?= ghcr.io/spinkube/spin-operator
+IMG ?= $(IMG_REPO):$(shell git rev-parse --short HEAD)-dev
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.28.3
@@ -116,17 +116,20 @@ run: manifests generate fmt vet ## Run a controller from your host.
 	go run -ldflags "${LDFLAGS}" ./cmd/main.go
 
 .PHONY: docker-build
+docker-build: GOARCH=$(shell go env GOARCH)
+docker-build: PLATFORMS ?= linux/$(GOARCH)
+docker-build: BUILDX_ACTION ?= --load
 docker-build: ## Build docker image with the manager.
-	$(CONTAINER_TOOL) build --load -t ${IMG} .
+	$(CONTAINER_TOOL) buildx build --platform=$(PLATFORMS) $(BUILDX_ACTION) -t ${IMG} .
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.
 	$(CONTAINER_TOOL) push ${IMG}
 
-PLATFORMS ?= linux/arm64,linux/amd64
 .PHONY: docker-build-and-publish-all
-docker-build-and-publish-all: ## Build the docker image for all supported platforms
-	$(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${IMG} .
+docker-build-and-publish-all: PLATFORMS ?= linux/arm64,linux/amd64
+docker-build-and-publish-all: BUILDX_ACTION ?= --push
+docker-build-and-publish-all: docker-build ## Build the docker image for all supported platforms
 
 ##@ Package