From 43107de57bea1a341f79c937075e9e333345c73d Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 5 Jun 2025 12:31:45 +0000
Subject: [PATCH] docker: Allow leaf stages to replenish caches after
 evictions. (closes #53)

Signed-off-by: Jason Volk <jason@zemos.net>
---
 docker/Dockerfile.cargo      | 8 ++++----
 docker/Dockerfile.cargo.deb  | 8 ++++----
 docker/Dockerfile.cargo.deps | 8 ++++----
 docker/Dockerfile.cargo.rpm  | 6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docker/Dockerfile.cargo b/docker/Dockerfile.cargo
index 10910a02..93cd26b3 100644
--- a/docker/Dockerfile.cargo
+++ b/docker/Dockerfile.cargo
@@ -27,9 +27,9 @@ WORKDIR /usr/src/tuwunel
 ENV targ_dir="${CARGO_TARGET_DIR}/${cargo_target_profile}"
 ENV targ_targ_dir="${CARGO_TARGET_DIR}/${rust_target}/${cargo_target_profile}"
 RUN \
---mount=type=cache,dst=${RUSTUP_HOME}/downloads,sharing=shared,ro \
---mount=type=cache,dst=${CARGO_HOME}/registry,sharing=shared,ro \
---mount=type=cache,dst=${CARGO_HOME}/git,sharing=shared,ro \
+--mount=type=cache,dst=${RUSTUP_HOME}/downloads,sharing=shared \
+--mount=type=cache,dst=${CARGO_HOME}/registry,sharing=shared \
+--mount=type=cache,dst=${CARGO_HOME}/git,sharing=shared \
 --mount=type=cache,dst=${targ_dir}/deps,id=${cargo_target_share}/deps,sharing=locked \
 --mount=type=cache,dst=${targ_dir}/build,id=${cargo_target_share}/build,sharing=locked \
 --mount=type=cache,dst=${targ_dir}/examples,id=${cargo_target_share}/examples,sharing=locked \
@@ -45,7 +45,7 @@ RUN \
     rustup run ${rust_toolchain} \
         cargo ${cargo_cmd} \
             --verbose \
-            --frozen \
+            --locked \
             --workspace \
             "${cargo_spec_features}" \
             --features "${cargo_features}" \
diff --git a/docker/Dockerfile.cargo.deb b/docker/Dockerfile.cargo.deb
index 0376f949..aa6369df 100644
--- a/docker/Dockerfile.cargo.deb
+++ b/docker/Dockerfile.cargo.deb
@@ -24,9 +24,9 @@ WORKDIR /usr/src/tuwunel
 ENV targ_dir="${CARGO_TARGET_DIR}/${cargo_target_profile}"
 ENV targ_targ_dir="${CARGO_TARGET_DIR}/${rust_target}/${cargo_target_profile}"
 RUN \
---mount=type=cache,dst=${RUSTUP_HOME}/downloads,sharing=shared,ro \
---mount=type=cache,dst=${CARGO_HOME}/registry,sharing=shared,ro \
---mount=type=cache,dst=${CARGO_HOME}/git,sharing=shared,ro \
+--mount=type=cache,dst=${RUSTUP_HOME}/downloads,sharing=shared \
+--mount=type=cache,dst=${CARGO_HOME}/registry,sharing=shared \
+--mount=type=cache,dst=${CARGO_HOME}/git,sharing=shared \
 --mount=type=cache,dst=${targ_dir}/deps,id=${cargo_target_share}/deps,sharing=locked \
 --mount=type=cache,dst=${targ_dir}/build,id=${cargo_target_share}/build,sharing=locked \
 --mount=type=cache,dst=${targ_dir}/examples,id=${cargo_target_share}/examples,sharing=locked \
@@ -43,7 +43,7 @@ RUN \
     rustup run ${rust_toolchain} \
         cargo deb \
             --verbose \
-            --frozen \
+            --locked \
             --no-build \
             "${cargo_spec_features}" \
             --features "${cargo_features}" \
diff --git a/docker/Dockerfile.cargo.deps b/docker/Dockerfile.cargo.deps
index d21db7a2..2739bff1 100644
--- a/docker/Dockerfile.cargo.deps
+++ b/docker/Dockerfile.cargo.deps
@@ -46,9 +46,9 @@ ENV CARGO_TARGET_DIR="${CARGO_TARGET_DIR}"
 ENV targ_dir="${CARGO_TARGET_DIR}/${cargo_target_profile}"
 ENV targ_targ_dir="${CARGO_TARGET_DIR}/${rust_target}/${cargo_target_profile}"
 RUN \
---mount=type=cache,dst=${RUSTUP_HOME}/downloads,sharing=shared,ro \
---mount=type=cache,dst=${CARGO_HOME}/registry,sharing=shared,ro \
---mount=type=cache,dst=${CARGO_HOME}/git,sharing=shared,ro \
+--mount=type=cache,dst=${RUSTUP_HOME}/downloads,sharing=shared \
+--mount=type=cache,dst=${CARGO_HOME}/registry,sharing=shared \
+--mount=type=cache,dst=${CARGO_HOME}/git,sharing=shared \
 --mount=type=cache,dst=${targ_dir}/deps,id=${cargo_target_share}/deps,sharing=locked \
 --mount=type=cache,dst=${targ_dir}/build,id=${cargo_target_share}/build,sharing=locked \
 --mount=type=cache,dst=${targ_dir}/examples,id=${cargo_target_share}/examples,sharing=locked \
@@ -64,7 +64,7 @@ RUN \
     rustup run ${rust_toolchain} \
         cargo chef cook ${cook_args} \
             --verbose \
-            --frozen \
+            --locked \
             --workspace \
             "${cargo_spec_features}" \
             --features "${cargo_features}" \
diff --git a/docker/Dockerfile.cargo.rpm b/docker/Dockerfile.cargo.rpm
index f1db1365..3d2b748a 100644
--- a/docker/Dockerfile.cargo.rpm
+++ b/docker/Dockerfile.cargo.rpm
@@ -21,9 +21,9 @@ COPY --link --from=input . .
 
 WORKDIR /usr/src/tuwunel
 RUN \
---mount=type=cache,dst=${RUSTUP_HOME}/downloads,sharing=shared,ro \
---mount=type=cache,dst=${CARGO_HOME}/registry,sharing=shared,ro \
---mount=type=cache,dst=${CARGO_HOME}/git,sharing=shared,ro \
+--mount=type=cache,dst=${RUSTUP_HOME}/downloads,sharing=shared \
+--mount=type=cache,dst=${CARGO_HOME}/registry,sharing=shared \
+--mount=type=cache,dst=${CARGO_HOME}/git,sharing=shared \
 --mount=type=cache,dst=${targ_dir}/deps,id=${cargo_target_share}/deps,sharing=locked \
 --mount=type=cache,dst=${targ_dir}/build,id=${cargo_target_share}/build,sharing=locked \
 --mount=type=cache,dst=${targ_dir}/examples,id=${cargo_target_share}/examples,sharing=locked \