From 5bd174d287500e39e31654c28750e4dd3936402e Mon Sep 17 00:00:00 2001
From: SinTan1729 <sayantan.santra689@gmail.com>
Date: Sun, 24 Mar 2024 23:03:18 -0500
Subject: [PATCH] build: Switched to a cross-rt based multi-arch build process

---
 Dockerfile | 28 ++++------------------------
 Makefile   | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 24 deletions(-)
 create mode 100644 Makefile

diff --git a/Dockerfile b/Dockerfile
index b2f6b89..567cb8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,8 @@
-FROM lukemathwalker/cargo-chef:latest-rust-slim AS chef
-WORKDIR /chhoto-url
-
-FROM chef as planner
-COPY ./actix/Cargo.toml ./actix/Cargo.lock .
-COPY ./actix/src ./src
-RUN cargo chef prepare --recipe-path recipe.json
-
-FROM chef as builder
-ARG target=x86_64-unknown-linux-musl
-RUN apt-get update && apt-get install -y musl-tools
-RUN rustup target add $target
-
-COPY --from=planner /chhoto-url/recipe.json recipe.json
-# Build dependencies - this is the caching Docker layer
-RUN cargo chef cook --release --target=$target --recipe-path recipe.json
-
-COPY ./actix/Cargo.toml ./actix/Cargo.lock .
-COPY ./actix/src ./src
-# Build application
-RUN cargo build --release --target=$target --locked --bin chhoto-url
-
 FROM scratch
-ARG target=x86_64-unknown-linux-musl
-COPY --from=builder /chhoto-url/target/$target/release/chhoto-url /chhoto-url
+ARG ARCH=linux/amd64
+
+COPY $ARCH/chhoto-url /chhoto-url
 COPY ./resources /resources
+
 ENTRYPOINT ["/chhoto-url"]
 
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..62da911
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,18 @@
+setup:
+	cargo install cross
+
+build:
+	cross build --release --locked --manifest-path=actix/Cargo.toml --target aarch64-unknown-linux-musl
+	cross build --release --locked --manifest-path=actix/Cargo.toml --target x86_64-unknown-linux-musl
+
+docker: build
+	mkdir -p linux/amd64 linux/arm64
+	cp actix/target/aarch64-unknown-linux-musl/release/chhoto-url linux/aarch64/
+	cp actix/target/x86_64-unknown-linux-musl/release/chhoto-url linux/amd64/
+	docker buildx -t chhoto-url --platform linux/amd64,linux/arm64,linux/arm/v7 .
+	rm -rf linux
+
+clean:
+	cargo clean --manifest-path=actix/Cargo.toml
+
+.PHONY: build clean docker