CLOUDP-323996: Fix make multiarch image

Author: josvazg

Makefile

@@ -324,8 +324,10 @@ bundle: manifests  ## Generate bundle manifests and metadata, then validate gene
 image: ## Build the operator image
 	$(MAKE) bin/linux/amd64/manager TARGET_OS=linux TARGET_ARCH=amd64 VERSION=$(VERSION)
 	$(MAKE) bin/linux/arm64/manager TARGET_OS=linux TARGET_ARCH=arm64 VERSION=$(VERSION)
-	$(CONTAINER_ENGINE) build -f fast.Dockerfile --build-arg VERSION=$(VERSION) -t $(OPERATOR_IMAGE) .
-	$(CONTAINER_ENGINE) push $(OPERATOR_IMAGE)
+	$(CONTAINER_ENGINE) buildx create --use --name multiarch-builder \
+	--driver docker-container --bootstrap || echo "reusing multiarch-builder"
+	$(CONTAINER_ENGINE) buildx build --platform linux/amd64,linux/arm64 --push \
+	-f fast.Dockerfile --build-arg VERSION=$(VERSION) -t $(OPERATOR_IMAGE) .
 
 .PHONY: bundle-build
 bundle-build: ## Build the bundle image.

fast.Dockerfile

@@ -1,9 +1,9 @@
 # TODO: Eventually replace main Dockerfile
-FROM golang:1.24 as certs-source
+FROM golang:1.24 AS certs-source
 ARG GOTOOLCHAIN=auto
 
 # Using rolling tag to stay on latest UBI 9
-FROM registry.access.redhat.com/ubi9/ubi:latest as ubi-certs
+FROM registry.access.redhat.com/ubi9/ubi:latest AS ubi-certs
 FROM registry.access.redhat.com/ubi9/ubi-micro:latest
 
 ARG TARGETOS