From 47f7e33a28911edf204ec980d6f5082fb1ee4a74 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 29 May 2025 06:51:21 +0000
Subject: [PATCH] docker: Cache shared target deps and build directories.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 docker/Dockerfile.cargo         | 2 ++
 docker/Dockerfile.cargo.deb     | 2 ++
 docker/Dockerfile.cargo.deps    | 2 ++
 docker/Dockerfile.cargo.install | 2 ++
 docker/Dockerfile.cargo.rpm     | 2 ++
 docker/bake.hcl                 | 2 +-
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile.cargo b/docker/Dockerfile.cargo
index 49b544de..ff791d70 100644
--- a/docker/Dockerfile.cargo
+++ b/docker/Dockerfile.cargo
@@ -24,6 +24,8 @@ RUN \
 --mount=type=cache,dst=${RUSTUP_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_TARGET_DIR},sharing=locked \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/deps,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/build,sharing=shared \
 <<EOF
     set -eux
     rustup run ${rust_toolchain} \
diff --git a/docker/Dockerfile.cargo.deb b/docker/Dockerfile.cargo.deb
index 63de4d76..e629be21 100644
--- a/docker/Dockerfile.cargo.deb
+++ b/docker/Dockerfile.cargo.deb
@@ -21,6 +21,8 @@ RUN \
 --mount=type=cache,dst=${RUSTUP_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_TARGET_DIR},sharing=locked \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/deps,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/build,sharing=shared \
 <<EOF
     set -eux
     mkdir -p "${pkg_dir}"
diff --git a/docker/Dockerfile.cargo.deps b/docker/Dockerfile.cargo.deps
index 8129a697..f3f34ae6 100644
--- a/docker/Dockerfile.cargo.deps
+++ b/docker/Dockerfile.cargo.deps
@@ -25,6 +25,8 @@ RUN \
 --mount=type=cache,dst=${RUSTUP_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_TARGET_DIR},sharing=locked \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/deps,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/build,sharing=shared \
 <<EOF
     set -eux
     rustup run ${rust_toolchain} \
diff --git a/docker/Dockerfile.cargo.install b/docker/Dockerfile.cargo.install
index 0915c1f9..5a1c821c 100644
--- a/docker/Dockerfile.cargo.install
+++ b/docker/Dockerfile.cargo.install
@@ -26,6 +26,8 @@ RUN \
 --mount=type=cache,dst=${RUSTUP_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_TARGET_DIR},sharing=locked \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/deps,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/build,sharing=shared \
 <<EOF
     set -eux
     case "$cargo_profile" in
diff --git a/docker/Dockerfile.cargo.rpm b/docker/Dockerfile.cargo.rpm
index dfd86616..f44213e8 100644
--- a/docker/Dockerfile.cargo.rpm
+++ b/docker/Dockerfile.cargo.rpm
@@ -21,6 +21,8 @@ RUN \
 --mount=type=cache,dst=${RUSTUP_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_TARGET_DIR},sharing=locked \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/deps,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/build,sharing=shared \
 <<EOF
 	set -eux
 	mkdir -p "${pkg_dir}"
diff --git a/docker/bake.hcl b/docker/bake.hcl
index 5bcb55ab..85dddd03 100644
--- a/docker/bake.hcl
+++ b/docker/bake.hcl
@@ -1046,7 +1046,7 @@ target "deps-base" {
     args = {
         cargo_profile = cargo_profile
         cook_args = "--all-targets --no-build"
-        CARGO_TARGET_DIR = "/usr/src/tuwunel/target/${sys_name}/${sys_version}/${rust_toolchain}/${cargo_profile}"
+        CARGO_TARGET_DIR = "/usr/src/tuwunel/target/${sys_name}/${sys_version}/${rust_toolchain}/${cargo_profile}/${feat_set}"
         CARGO_PROFILE_test_DEBUG = "0"
         CARGO_PROFILE_bench_DEBUG = "0"
         CARGO_PROFILE_bench_LTO = "0"