From c92f4fbf8470b46e3985e2d41ccc90f4be17690e Mon Sep 17 00:00:00 2001
From: Joakim Hulthe <joakim.hulthe@mullvad.net>
Date: Mon, 30 Mar 2026 14:45:42 +0200
Subject: [PATCH] Mount CARGO_HOME into build container

---
 docker-build.sh | 5 ++++-
 podman-build.sh | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docker-build.sh b/docker-build.sh
index 41ba4ae..bac8401 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -5,6 +5,7 @@ cd "$(dirname "$0")"
 
 package="$1"
 builder_image="mullvad-slint-musl-builder"
+cargo_home="${CARGO_HOME:-$HOME/.cargo}"
 . "$HOME/.abuild/abuild.conf"
 
 docker build . -f Dockerfile -t "$builder_image"
@@ -14,8 +15,10 @@ docker run --rm \
     -v "$PACKAGER_PRIVKEY":/key.rsa:ro \
     -v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \
     -v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \
-    -v ./target:/cargo-target \
     -v ./packages:/root/packages \
+    -v "$cargo_home":/cargo-home \
+    -e "CARGO_HOME=/cargo-home" \
+    -v ./target:/cargo-target \
     -e "CARGO_TARGET_DIR=/cargo-target" \
     -it \
     "$builder_image" \
diff --git a/podman-build.sh b/podman-build.sh
index 81f87cd..3fc1281 100755
--- a/podman-build.sh
+++ b/podman-build.sh
@@ -5,6 +5,7 @@ cd "$(dirname "$0")"
 
 package="$1"
 builder_image="mullvad-slint-musl-builder"
+cargo_home="${CARGO_HOME:-$HOME/.cargo}"
 . "$HOME/.abuild/abuild.conf"
 
 podman build . -f Dockerfile -t "$builder_image"
@@ -14,8 +15,10 @@ podman run --rm \
     -v "$PACKAGER_PRIVKEY":/key.rsa:ro \
     -v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \
     -v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \
-    -v ./target:/cargo-target \
     -v ./packages:/root/packages \
+    -v "$cargo_home":/cargo-home \
+    -e "CARGO_HOME=/cargo-home" \
+    -v ./target:/cargo-target \
     -e "CARGO_TARGET_DIR=/cargo-target" \
     -it \
     "$builder_image" \