From 3c02faa532351f915712b8d02db2e6821437df30 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Fri, 30 May 2025 17:02:02 +0000
Subject: [PATCH] docker: Share the target deps and build caches globally.

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

diff --git a/docker/Dockerfile.cargo b/docker/Dockerfile.cargo
index ff791d70..4cd04f25 100644
--- a/docker/Dockerfile.cargo
+++ b/docker/Dockerfile.cargo
@@ -7,6 +7,7 @@ ARG RUSTUP_HOME
 ARG CARGO_HOME
 ARG CARGO_TARGET
 ARG CARGO_TARGET_DIR
+ARG CARGO_TARGET_CACHE
 ARG cargo_profile
 ARG cargo_features
 ARG cargo_spec_features
@@ -24,8 +25,10 @@ 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 \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/deps,id=${CARGO_TARGET_CACHE}/deps,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/build,id=${CARGO_TARGET_CACHE}/build,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/incremental,id=${CARGO_TARGET_CACHE}/incremental,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/.fingerprint,id=${CARGO_TARGET_CACHE}/fingerprint,sharing=shared \
 <<EOF
     set -eux
     rustup run ${rust_toolchain} \
diff --git a/docker/Dockerfile.cargo.deb b/docker/Dockerfile.cargo.deb
index 18b036b0..9cc135a3 100644
--- a/docker/Dockerfile.cargo.deb
+++ b/docker/Dockerfile.cargo.deb
@@ -7,6 +7,7 @@ ARG RUSTUP_HOME
 ARG CARGO_HOME
 ARG CARGO_TARGET
 ARG CARGO_TARGET_DIR
+ARG CARGO_TARGET_CACHE
 ARG cargo_profile
 ARG cargo_features
 ARG cargo_spec_features
@@ -21,8 +22,10 @@ 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 \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/deps,id=${CARGO_TARGET_CACHE}/deps,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/build,id=${CARGO_TARGET_CACHE}/build,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/incremental,id=${CARGO_TARGET_CACHE}/incremental,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/.fingerprint,id=${CARGO_TARGET_CACHE}/fingerprint,sharing=shared \
 <<EOF
     set -eux
     mkdir -p "${pkg_dir}"
diff --git a/docker/Dockerfile.cargo.deps b/docker/Dockerfile.cargo.deps
index ecd0e66d..1afcf900 100644
--- a/docker/Dockerfile.cargo.deps
+++ b/docker/Dockerfile.cargo.deps
@@ -7,6 +7,7 @@ ARG RUSTUP_HOME
 ARG CARGO_HOME
 ARG CARGO_TARGET
 ARG CARGO_TARGET_DIR
+ARG CARGO_TARGET_CACHE
 ARG CARGO_BUILD_RUSTFLAGS
 ARG CARGO_PROFILE_test_DEBUG
 ARG CARGO_PROFILE_bench_DEBUG
@@ -34,8 +35,10 @@ 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 \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/deps,id=${CARGO_TARGET_CACHE}/deps,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/build,id=${CARGO_TARGET_CACHE}/build,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/incremental,id=${CARGO_TARGET_CACHE}/incremental,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/.fingerprint,id=${CARGO_TARGET_CACHE}/fingerprint,sharing=shared \
 <<EOF
     set -eux
     rustup run ${rust_toolchain} \
diff --git a/docker/Dockerfile.cargo.install b/docker/Dockerfile.cargo.install
index bf707347..ccf1296a 100644
--- a/docker/Dockerfile.cargo.install
+++ b/docker/Dockerfile.cargo.install
@@ -7,6 +7,7 @@ ARG RUSTUP_HOME
 ARG CARGO_HOME
 ARG CARGO_TARGET
 ARG CARGO_TARGET_DIR
+ARG CARGO_TARGET_CACHE
 ARG cargo_profile
 ARG cargo_features
 ARG cargo_spec_features
@@ -26,8 +27,10 @@ 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 \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/deps,id=${CARGO_TARGET_CACHE}/deps,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/build,id=${CARGO_TARGET_CACHE}/build,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/incremental,id=${CARGO_TARGET_CACHE}/incremental,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/.fingerprint,id=${CARGO_TARGET_CACHE}/fingerprint,sharing=shared \
 <<EOF
     set -eux
     case "$cargo_profile" in
diff --git a/docker/Dockerfile.cargo.rpm b/docker/Dockerfile.cargo.rpm
index 78a705cd..0d3c5907 100644
--- a/docker/Dockerfile.cargo.rpm
+++ b/docker/Dockerfile.cargo.rpm
@@ -7,6 +7,7 @@ ARG RUSTUP_HOME
 ARG CARGO_HOME
 ARG CARGO_TARGET
 ARG CARGO_TARGET_DIR
+ARG CARGO_TARGET_CACHE
 ARG cargo_profile
 ARG cargo_features
 ARG cargo_spec_features
@@ -21,8 +22,10 @@ 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 \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/deps,id=${CARGO_TARGET_CACHE}/deps,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/build,id=${CARGO_TARGET_CACHE}/build,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/incremental,id=${CARGO_TARGET_CACHE}/incremental,sharing=shared \
+--mount=type=cache,dst=${CARGO_TARGET_DIR}/.fingerprint,id=${CARGO_TARGET_CACHE}/fingerprint,sharing=shared \
 <<EOF
 	set -eux
 	mkdir -p "${pkg_dir}"
diff --git a/docker/bake.hcl b/docker/bake.hcl
index d605c319..5d4c6b2f 100644
--- a/docker/bake.hcl
+++ b/docker/bake.hcl
@@ -1072,6 +1072,7 @@ target "deps-base" {
         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}/${feat_set}"
+        CARGO_TARGET_CACHE = "/usr/src/tuwunel/target/${sys_name}/${sys_version}/_shared_cache"
         CARGO_PROFILE_test_DEBUG = "0"
         CARGO_PROFILE_bench_DEBUG = "0"
         CARGO_PROFILE_bench_LTO = "0"