From e248bb05d9edf761aa547014483bff22b316d170 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Wed, 14 May 2025 14:16:22 +0200
Subject: [PATCH] docker: use verbose build for ci.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 docker/Dockerfile.cargo.deps    |  2 ++
 docker/Dockerfile.cargo.install |  2 +-
 docker/Dockerfile.ingredients   |  2 ++
 docker/bake.hcl                 | 21 +++++++++++++--------
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/docker/Dockerfile.cargo.deps b/docker/Dockerfile.cargo.deps
index ad6197df..dd2429f2 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_BUILD_RUSTFLAGS
 ARG cargo_profile
 ARG cargo_features
 ARG cargo_spec_features
@@ -19,6 +20,7 @@ COPY --from=rocksdb . .
 WORKDIR /usr/src/tuwunel
 COPY --link --from=recipe recipe.json .
 
+ENV CARGO_BUILD_RUSTFLAGS=${CARGO_BUILD_RUSTFLAGS}
 RUN \
 --mount=type=cache,dst=${RUSTUP_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_HOME},sharing=locked \
diff --git a/docker/Dockerfile.cargo.install b/docker/Dockerfile.cargo.install
index f29c83eb..2842f180 100644
--- a/docker/Dockerfile.cargo.install
+++ b/docker/Dockerfile.cargo.install
@@ -68,7 +68,7 @@ EOF
 ENV bin_path="${CARGO_INSTALL_ROOT}/bin/tuwunel"
 RUN <<EOF
     set -eux
-    ldd -v ${bin_path}
+    ldd -v ${bin_path} || echo "static"
     du -h ${bin_path}
     sha1sum ${bin_path}
 EOF
diff --git a/docker/Dockerfile.ingredients b/docker/Dockerfile.ingredients
index e1167b50..4a4284fb 100644
--- a/docker/Dockerfile.ingredients
+++ b/docker/Dockerfile.ingredients
@@ -20,10 +20,12 @@ ARG rust_toolchain
 ARG RUSTUP_HOME
 ARG CARGO_HOME
 ARG CARGO_TARGET
+ARG CARGO_TERM_VERBOSE=0
 
 WORKDIR /usr/src/tuwunel
 COPY --link --from=source /usr/src/tuwunel .
 
+ENV CARGO_TERM_VERBOSE="${CARGO_TERM_VERBOSE}"
 RUN \
 --mount=type=cache,dst=${RUSTUP_HOME},sharing=locked \
 --mount=type=cache,dst=${CARGO_HOME},sharing=locked \
diff --git a/docker/bake.hcl b/docker/bake.hcl
index d276bd92..2662dbf7 100644
--- a/docker/bake.hcl
+++ b/docker/bake.hcl
@@ -1,3 +1,4 @@
+variable "CI" {}
 variable "GITHUB_ACTOR" {}
 variable "GITHUB_REPOSITORY" {}
 variable "GITHUB_REF" {}
@@ -1113,6 +1114,17 @@ 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}"
+        CARGO_PROFILE_test_DEBUG = "0"
+        CARGO_PROFILE_bench_DEBUG = "0"
+        CARGO_PROFILE_bench_LTO = "0"
+        CARGO_PROFILE_bench_CODEGEN_UNITS = "1"
+        CARGO_BUILD_RUSTFLAGS = (
+            cargo_profile == "release-max-perf"?
+                join(" ", [join(" ", nightly_rustflags), join(" ", rmp_rustflags)]):
+            rust_toolchain == "nightly"?
+                join(" ", nightly_rustflags):
+                ""
+        )
     }
 }
 
@@ -1239,10 +1251,6 @@ target "ingredients" {
         source = elem("target:source", [feat_set, sys_name, sys_version, sys_target])
     }
     args = {
-        CARGO_PROFILE_test_DEBUG = "0"
-        CARGO_PROFILE_bench_DEBUG = "0"
-        CARGO_PROFILE_bench_LTO = "0"
-        CARGO_PROFILE_bench_CODEGEN_UNITS = "1"
         cargo_features = join(",", [
             cargo_feat_sets[feat_set],
             cargo_features_always,
@@ -1251,10 +1259,7 @@ target "ingredients" {
             feat_set == "all"?
                 "--all-features": "--no-default-features"
         )
-        CARGO_BUILD_RUSTFLAGS = (
-            rust_toolchain == "nightly"?
-                join(" ", nightly_rustflags): ""
-        )
+        CARGO_TERM_VERBOSE = CI == "true"
         RUST_BACKTRACE = "full"
         ROCKSDB_LIB_DIR="/usr/lib/${sys_target}"
         JEMALLOC_OVERRIDE="/usr/lib/${sys_target}/libjemalloc.so"