From a584b3262a39670b86472227c9eff14ed1a2d94e Mon Sep 17 00:00:00 2001
From: Richard <richard.yao@antithesis.com>
Date: Fri, 22 Aug 2025 16:11:13 -0400
Subject: [PATCH 1/2] build improvmements add --load to docker and pass in
 LOCAL_BUILD

---
 Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 73eb543..c7547dc 100644
--- a/Makefile
+++ b/Makefile
@@ -9,22 +9,23 @@ TARGET_ARCH ?= $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/'
 DOCKER_PLATFORM = linux/$(TARGET_ARCH)
 
 # Simple build command that works with any architecture
-BUILD_CMD = docker build
+BUILD_CMD = docker build --load
+LOCAL_BUILD ?= 1
 
 .PHONY: build-forest
 build-forest:
 	@echo "Building forest for $(TARGET_ARCH) architecture..."
-	$(BUILD_CMD) --build-arg GIT_COMMIT=$(forest_commit) -t forest:latest -f forest/Dockerfile forest
+	$(BUILD_CMD) --build-arg GIT_COMMIT=$(forest_commit) --build-arg LOCAL_BUILD=${LOCAL_BUILD}  -t forest:latest -f forest/Dockerfile forest
 
 .PHONY: build-drand
 build-drand:
 	@echo "Building drand for $(TARGET_ARCH) architecture..."
-	$(BUILD_CMD) --build-arg=GIT_BRANCH=$(drand_tag) -t drand:latest -f drand/Dockerfile drand
+	$(BUILD_CMD) --build-arg=GIT_BRANCH=$(drand_tag) --build-arg LOCAL_BUILD=${LOCAL_BUILD} -t drand:latest -f drand/Dockerfile drand
 
 .PHONY: build-lotus
 build-lotus:
 	@echo "Building lotus for $(TARGET_ARCH) architecture..."
-	$(BUILD_CMD) --build-arg=GIT_BRANCH=$(lotus_tag) -t lotus:latest -f lotus/Dockerfile lotus
+	$(BUILD_CMD) --build-arg=GIT_BRANCH=$(lotus_tag) --build-arg LOCAL_BUILD=${LOCAL_BUILD} -t lotus:latest -f lotus/Dockerfile lotus
 
 .PHONY: build-workload
 build-workload:
@@ -59,4 +60,4 @@ help:
 	@echo "  cleanup          - Clean up containers and run cleanup script"
 	@echo ""
 	@echo "Architecture control:"
-	@echo "  make all                  - Build all services for current architecture"
\ No newline at end of file
+	@echo "  make all                  - Build all services for current architecture"

From 8c2f2ee1553dae4ba1bbf7d3bf5e36748df9bdf7 Mon Sep 17 00:00:00 2001
From: Richard <richard.yao@antithesis.com>
Date: Fri, 22 Aug 2025 16:49:08 -0400
Subject: [PATCH 2/2] fix: only need LOCAL_BUILD for forest

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c7547dc..041ee4b 100644
--- a/Makefile
+++ b/Makefile
@@ -20,12 +20,12 @@ build-forest:
 .PHONY: build-drand
 build-drand:
 	@echo "Building drand for $(TARGET_ARCH) architecture..."
-	$(BUILD_CMD) --build-arg=GIT_BRANCH=$(drand_tag) --build-arg LOCAL_BUILD=${LOCAL_BUILD} -t drand:latest -f drand/Dockerfile drand
+	$(BUILD_CMD) --build-arg=GIT_BRANCH=$(drand_tag) -t drand:latest -f drand/Dockerfile drand
 
 .PHONY: build-lotus
 build-lotus:
 	@echo "Building lotus for $(TARGET_ARCH) architecture..."
-	$(BUILD_CMD) --build-arg=GIT_BRANCH=$(lotus_tag) --build-arg LOCAL_BUILD=${LOCAL_BUILD} -t lotus:latest -f lotus/Dockerfile lotus
+	$(BUILD_CMD) --build-arg=GIT_BRANCH=$(lotus_tag) -t lotus:latest -f lotus/Dockerfile lotus
 
 .PHONY: build-workload
 build-workload: