studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

docker: use verbose build for ci.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-05-14 14:16:22 +02:00
parent 71ebf1e71a
commit e248bb05d9
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/Dockerfile.cargo.deps
View File

@@ -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 \

2
docker/Dockerfile.cargo.install
View File

@@ -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

2
docker/Dockerfile.ingredients
View File

@@ -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 \

21
docker/bake.hcl
View File

@@ -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"