From b3dba38385d4fc44cd21b1c8e2acc19b3890cfc8 Mon Sep 17 00:00:00 2001
From: Vegard Stikbakke <vegard.stikbakke@gmail.com>
Date: Tue, 18 Jun 2024 13:06:54 +0200
Subject: [PATCH] Build Docker images for both arm and amd

---
 .github/workflows/build.yaml | 10 ++++++----
 Makefile                     | 13 ++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1a61b43..ee69ca7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,10 +1,12 @@
 ---
 name: "Build"
 
-on:
-  push:
-    branches:
-      - main
+# on:
+#   push:
+#     branches:
+#       - main
+
+on: pull_request
 
 jobs:
   build:
diff --git a/Makefile b/Makefile
index 213f564..090dce4 100644
--- a/Makefile
+++ b/Makefile
@@ -38,11 +38,14 @@ gen-mocks: bin/moq ./client/jsonrpc/ ./client/duneapi/
 
 
 image-build:
-	@echo "# Building indexer docker image..."
-	docker build -t $(APPLICATION) -f Dockerfile --build-arg GITHUB_TOKEN=${GITHUB_TOKEN} .
+	@echo "# Building indexer docker image for amd64 and arm64"
+	docker buildx build --platform linux/amd64 -t ${APPLICATION}-amd64 -f Dockerfile --build-arg GITHUB_TOKEN=${GITHUB_TOKEN} .
+	docker buildx build --platform linux/arm64 -t ${APPLICATION}-arm64 -f Dockerfile --build-arg GITHUB_TOKEN=${GITHUB_TOKEN} .
+	docker manifest create -a "${APPLICATION}" "${APPLICATION}-amd64"
+	docker manifest create -a "${APPLICATION}" "${APPLICATION}-arm64"
 
 image-push: image-build
-	@echo "# Pushing indexer docker image..."
-	docker tag $(APPLICATION) ${IMAGE_TAG}
-	# docker push ${IMAGE_TAG}
+	@echo "# Pushing indexer docker images"
+	docker tag ${APPLICATION} ${IMAGE_TAG}
+	docker push ${IMAGE_TAG}
 	docker rmi ${IMAGE_TAG}