diff --git a/docker/Dockerfile.cargo b/docker/Dockerfile.cargo index ac727791..dcb5eebe 100644 --- a/docker/Dockerfile.cargo +++ b/docker/Dockerfile.cargo @@ -27,7 +27,7 @@ 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=${CARGO_TARGET_DIR},id=${cargo_tgt_dst}/${cargo_tgt_sub},sharing=locked \ +--mount=type=cache,dst=${CARGO_TARGET_DIR},id=${cargo_tgt_dst},sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/deps,id=${cargo_tgt_cache}/deps,sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/build,id=${cargo_tgt_cache}/build,sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/incremental,id=${cargo_tgt_cache}/incremental,sharing=locked \ diff --git a/docker/Dockerfile.cargo.deb b/docker/Dockerfile.cargo.deb index a6bce163..266e979d 100644 --- a/docker/Dockerfile.cargo.deb +++ b/docker/Dockerfile.cargo.deb @@ -24,7 +24,7 @@ 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=${CARGO_TARGET_DIR},id=${cargo_tgt_dst}/${cargo_tgt_sub},sharing=locked \ +--mount=type=cache,dst=${CARGO_TARGET_DIR},id=${cargo_tgt_dst},sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/debian,id=${cargo_tgt_dst}/debian,sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/deps,id=${cargo_tgt_cache}/deps,sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/build,id=${cargo_tgt_cache}/build,sharing=locked \ diff --git a/docker/Dockerfile.cargo.deps b/docker/Dockerfile.cargo.deps index 9fba9089..5ae64392 100644 --- a/docker/Dockerfile.cargo.deps +++ b/docker/Dockerfile.cargo.deps @@ -12,10 +12,13 @@ ARG cargo_tgt_sub ARG cargo_tgt_cache ARG CARGO_BUILD_RUSTFLAGS ARG CARGO_PROFILE_TEST_DEBUG +ARG CARGO_PROFILE_TEST_BUILD_OVERRIDE_DEBUG +ARG CARGO_PROFILE_TEST_INCREMENTAL ARG CARGO_PROFILE_BENCH_DEBUG +ARG CARGO_PROFILE_BENCH_BUILD_OVERRIDE_DEBUG ARG CARGO_PROFILE_BENCH_LTO -ARG CARGO_PROFILE_BENCH_CODEGEN_UNITS ARG CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG +ARG CARGO_PROFILE_RELEASE_LTO ARG cargo_profile ARG cargo_features ARG cargo_spec_features @@ -34,15 +37,18 @@ COPY --link --from=recipe recipe.json . ENV CARGO_TARGET_DIR="${CARGO_TARGET_DIR}" ENV CARGO_BUILD_RUSTFLAGS="${CARGO_BUILD_RUSTFLAGS}" ENV CARGO_PROFILE_TEST_DEBUG="${CARGO_PROFILE_TEST_DEBUG}" +ENV CARGO_PROFILE_TEST_BUILD_OVERRIDE_DEBUG="${CARGO_PROFILE_TEST_BUILD_OVERRIDE_DEBUG}" +ENV CARGO_PROFILE_TEST_INCREMENTAL="${CARGO_PROFILE_TEST_INCREMENTAL}" ENV CARGO_PROFILE_BENCH_DEBUG="${CARGO_PROFILE_BENCH_DEBUG}" +ENV CARGO_PROFILE_BENCH_BUILD_OVERRIDE_DEBUG="${CARGO_PROFILE_BENCH_BUILD_OVERRIDE_DEBUG}" ENV CARGO_PROFILE_BENCH_LTO="${CARGO_PROFILE_BENCH_LTO}" -ENV CARGO_PROFILE_BENCH_CODEGEN_UNITS="${CARGO_PROFILE_BENCH_CODEGEN_UNITS}" ENV CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG="${CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG}" +ENV CARGO_PROFILE_RELEASE_LTO="${CARGO_PROFILE_RELEASE_LTO}" 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=${CARGO_TARGET_DIR},id=${cargo_tgt_dst}/${cargo_tgt_sub},sharing=locked \ +--mount=type=cache,dst=${CARGO_TARGET_DIR},id=${cargo_tgt_dst},sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/deps,id=${cargo_tgt_cache}/deps,sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/build,id=${cargo_tgt_cache}/build,sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/incremental,id=${cargo_tgt_cache}/incremental,sharing=locked \ diff --git a/docker/Dockerfile.cargo.install b/docker/Dockerfile.cargo.install index 06181d25..e5932b4e 100644 --- a/docker/Dockerfile.cargo.install +++ b/docker/Dockerfile.cargo.install @@ -29,7 +29,7 @@ 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=${CARGO_TARGET_DIR},id=${cargo_tgt_dst}/${cargo_tgt_sub},sharing=locked \ +--mount=type=cache,dst=${CARGO_TARGET_DIR},id=${cargo_tgt_dst},sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/deps,id=${cargo_tgt_cache}/deps,sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/build,id=${cargo_tgt_cache}/build,sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/incremental,id=${cargo_tgt_cache}/incremental,sharing=locked \ diff --git a/docker/Dockerfile.cargo.rpm b/docker/Dockerfile.cargo.rpm index 0f6e3820..499f4dc5 100644 --- a/docker/Dockerfile.cargo.rpm +++ b/docker/Dockerfile.cargo.rpm @@ -24,7 +24,7 @@ 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=${CARGO_TARGET_DIR},id=${cargo_tgt_dst}/${cargo_tgt_sub},sharing=locked \ +--mount=type=cache,dst=${CARGO_TARGET_DIR},id=${cargo_tgt_dst},sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/deps,id=${cargo_tgt_cache}/deps,sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/build,id=${cargo_tgt_cache}/build,sharing=locked \ --mount=type=cache,dst=${CARGO_TARGET_DIR}/${cargo_tgt_sub}/incremental,id=${cargo_tgt_cache}/incremental,sharing=locked \ diff --git a/docker/Dockerfile.complement b/docker/Dockerfile.complement index 70f5d32c..f38d4fdb 100644 --- a/docker/Dockerfile.complement +++ b/docker/Dockerfile.complement @@ -8,6 +8,7 @@ WORKDIR / COPY --link --from=input . . RUN \ +--mount=type=cache,dst=/var/lock/uwu/local,sharing=locked \ --mount=type=cache,dst=${var_cache},sharing=locked \ --mount=type=cache,dst=${var_lib_apt},sharing=locked \ <