From fdb4d5ad60cb83729d3aeeb1bbc4f8ed60bef568 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Tue, 31 Oct 2023 14:21:12 +0530
Subject: [PATCH] docker: Switch to using buildx

Part of getting ARM and AMD64 images published. I have those
working locally, but wanted to provide piecemeal PRs!
---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 31fa945d..85b92f2f 100644
--- a/Makefile
+++ b/Makefile
@@ -71,11 +71,12 @@ clean:
 
 .PHONY: image/build-init
 image/build-init:
-	$(DOCKER) build \
+	DOCKER_BUILDKIT=1 $(DOCKER) buildx build \
 		--progress=$(DOCKER_BUILD_PROGRESS) \
 		-t $(IMAGE_INITCONTAINER_BRANCH) \
 		-f ./build/Dockerfile.initcontainer \
 		${IMAGE_BUILD_FLAGS_EXTRA} \
+		--load \
 		./build
 	$(DOCKER) tag "$(IMAGE_INITCONTAINER_BRANCH)" "$(IMAGE_INITCONTAINER_COMMIT)"
 	$(DOCKER) tag "$(IMAGE_INITCONTAINER_BRANCH)" "$(IMAGE_INITCONTAINER_TAG)"
@@ -83,7 +84,7 @@ image/build-init:
 
 .PHONY: image/build
 image/build:
-	DOCKER_BUILDKIT=1 $(DOCKER) build \
+	DOCKER_BUILDKIT=1 $(DOCKER) buildx build \
 		--build-arg bpftraceversion=$(BPFTRACEVERSION) \
 		--build-arg GIT_ORG=$(GIT_ORG) \
 		--progress=$(DOCKER_BUILD_PROGRESS) \
@@ -91,6 +92,7 @@ image/build:
 		--cache-from "$(IMAGE_TRACERUNNER_BRANCH)" \
 		-t "$(IMAGE_TRACERUNNER_BRANCH)" \
 		-f build/Dockerfile.tracerunner \
+		--load \
 		${IMAGE_BUILD_FLAGS_EXTRA} \
 		.
 	$(DOCKER) tag "$(IMAGE_TRACERUNNER_BRANCH)" "$(IMAGE_TRACERUNNER_COMMIT)"