From 9739735682fd568dd4b3d129c5104b0622d0f1d9 Mon Sep 17 00:00:00 2001
From: vbadrina <vbadrina@redhat.com>
Date: Thu, 20 Jun 2024 13:11:24 +0530
Subject: [PATCH] Refactor Makefile to support customizable build tool

This change provides the flexibility to use different container build tools by simply setting the `BUILD_TOOL` variable.

Signed-off-by: vbadrina <vbadrina@redhat.com>
---
 .github/workflows/publish-images.yaml |  4 ++--
 .github/workflows/test-and-build.yaml |  2 +-
 Makefile                              | 16 ++++++++--------
 hack/make/vars.mk                     |  1 +
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/publish-images.yaml b/.github/workflows/publish-images.yaml
index dc9d35b6..701c7137 100644
--- a/.github/workflows/publish-images.yaml
+++ b/.github/workflows/publish-images.yaml
@@ -31,7 +31,7 @@ jobs:
         go-version: ${{ matrix.go }}
 
     - name: Build
-      run: make docker-build
+      run: make operator-build
 
     - name: Login to Quay
       uses: docker/login-action@v1
@@ -41,7 +41,7 @@ jobs:
         password: ${{ secrets.QUAY_ROBOT_TOKEN }}
 
     - name: Push
-      run: make docker-push
+      run: make operator-push
 
   publish-bundle:
     name: Bundle Image
diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml
index c44fcd74..f20e6369 100644
--- a/.github/workflows/test-and-build.yaml
+++ b/.github/workflows/test-and-build.yaml
@@ -84,7 +84,7 @@ jobs:
         go-version: ${{ matrix.go }}
 
     - name: Build
-      run: make docker-build
+      run: make operator-build
 
   validate-bundle:
     name: Validate Operator Bundle
diff --git a/Makefile b/Makefile
index 83e87a88..a5d5d6b7 100644
--- a/Makefile
+++ b/Makefile
@@ -74,11 +74,11 @@ build: generate fmt vet golangci-lint kube-linter ## Build manager binary.
 run: manifests generate fmt vet ## Run a controller from your host.
 	go run ./main.go
 
-docker-build: generate fmt vet golangci-lint kube-linter ## Build docker image with the manager.
-	docker build -t ${IMG} .
+operator-build: generate fmt vet golangci-lint kube-linter ## Build docker image with the manager.
+	${BUILD_TOOL} build -t ${IMG} .
 
-docker-push: ## Push docker image with the manager.
-	docker push ${IMG}
+operator-push: ## Push docker image with the manager.
+	${BUILD_TOOL} push ${IMG}
 
 ##@ Deployment
 
@@ -117,19 +117,19 @@ endif
 
 .PHONY: bundle-build
 bundle-build: bundle ## Build the bundle image.
-	docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
+	${BUILD_TOOL} build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
 
 .PHONY: bundle-push
 bundle-push: ## Push the bundle image.
-	$(MAKE) docker-push IMG=$(BUNDLE_IMG)
+	$(MAKE) operator-push IMG=$(BUNDLE_IMG)
 
 .PHONY: catalog-build
 catalog-build: opm ## Build a catalog image.
-	$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
+	$(OPM) index add --container-tool ${BUILD_TOOL} --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
 
 .PHONY: catalog-push
 catalog-push: ## Push a catalog image.
-	$(MAKE) docker-push IMG=$(CATALOG_IMG)
+	$(MAKE) operator-push IMG=$(CATALOG_IMG)
 
 ##@ Actions
 
diff --git a/hack/make/vars.mk b/hack/make/vars.mk
index 249a8884..9301cae9 100644
--- a/hack/make/vars.mk
+++ b/hack/make/vars.mk
@@ -22,6 +22,7 @@ MULTICLUSTER_CONSOLE_IMG_TAG ?= latest
 IMG ?=  $(IMAGE_REGISTRY)/$(REGISTRY_NAMESPACE)/$(IMAGE_NAME):$(IMAGE_TAG)
 MULTICLUSTER_CONSOLE_IMG ?= ${IMAGE_REGISTRY}/$(REGISTRY_NAMESPACE)/$(MULTICLUSTER_CONSOLE_IMG_NAME):$(MULTICLUSTER_CONSOLE_IMG_TAG)
 
+BUILD_TOOL ?= docker
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
 # To re-generate a bundle for other specific channels without changing the standard setup, you can: