docker: Increase caching; explicit serialization to force convergence.

docker: Adjust profile overrides

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-06-02 06:20:37 +00:00
parent 1a6cfe72b9
commit d290bcbca9
12 changed files with 45 additions and 17 deletions

View File

@@ -13,7 +13,9 @@ COPY --link --from=input . .
ENV CARGO_TARGET="${rust_target}"
WORKDIR /opt
RUN <<EOF
RUN \
--mount=type=cache,dst=/var/lock/uwu/local,sharing=locked \
<<EOF
set -eux
url="https://static.rust-lang.org/rustup/archive/${rustup_version}/${rust_target}/rustup-init"
@@ -24,6 +26,7 @@ EOF
ENV RUSTUP_HOME="${RUSTUP_HOME}"
ENV CARGO_HOME="${CARGO_HOME}"
RUN \
--mount=type=cache,dst=/var/lock/uwu/local,sharing=locked \
--mount=type=cache,dst=${RUSTUP_HOME}/downloads,sharing=locked \
--mount=type=cache,dst=${CARGO_HOME}/registry,sharing=locked \
--mount=type=cache,dst=${CARGO_HOME}/git,sharing=locked \
@@ -56,6 +59,7 @@ WORKDIR /
COPY --link --from=input . .
RUN \
--mount=type=cache,dst=/var/lock/uwu/local,sharing=locked \
--mount=type=cache,dst=${RUSTUP_HOME}/downloads,sharing=locked \
--mount=type=cache,dst=${CARGO_HOME}/registry,sharing=locked \
--mount=type=cache,dst=${CARGO_HOME}/git,sharing=locked \
@@ -66,10 +70,16 @@ RUN \
--target ${rust_target} \
${rustup_components} \
;
EOF
RUN \
--mount=type=cache,dst=/var/lock/uwu/local,sharing=locked \
--mount=type=cache,dst=${RUSTUP_HOME}/downloads,sharing=locked \
--mount=type=cache,dst=${CARGO_HOME}/registry,sharing=locked \
--mount=type=cache,dst=${CARGO_HOME}/git,sharing=locked \
<<EOF
rustup run --install ${rust_toolchain} \
cargo install \
--quiet \
--locked \
--target ${rust_target} \
${cargo_installs} \