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

docker: Add build-overrides for custom external rocksdb.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-05-31 00:26:53 +00:00
parent 2be61de70f
commit d3233ce8b6
3 changed files with 91 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/Dockerfile.ingredients
View File

@@ -27,7 +27,7 @@ ARG CARGO_TERM_VERBOSE=0
ARG RUST_BACKTRACE ARG RUST_BACKTRACE
ARG JEMALLOC_OVERRIDE ARG JEMALLOC_OVERRIDE
#ARG ZSTD_SYS_USE_PKG_CONFIG=0 #ARG ZSTD_SYS_USE_PKG_CONFIG=0
#ARG ROCKSDB_LIB_DIR ARG ROCKSDB_LIB_DIR
WORKDIR / WORKDIR /
COPY --link --from=input . . COPY --link --from=input . .
@@ -39,7 +39,7 @@ ENV CARGO_TERM_VERBOSE="${CARGO_TERM_VERBOSE}"
ENV RUST_BACKTRACE="${RUST_BACKTRACE}" ENV RUST_BACKTRACE="${RUST_BACKTRACE}"
ENV JEMALLOC_OVERRIDE="${JEMALLOC_OVERRIDE}" ENV JEMALLOC_OVERRIDE="${JEMALLOC_OVERRIDE}"
#ENV ZSTD_SYS_USE_PKG_CONFIG="${ZSTD_SYS_USE_PKG_CONFIG}" #ENV ZSTD_SYS_USE_PKG_CONFIG="${ZSTD_SYS_USE_PKG_CONFIG}"
#ENV ROCKSDB_LIB_DIR="${ROCKSDB_LIB_DIR}" ENV ROCKSDB_LIB_DIR="${ROCKSDB_LIB_DIR}"
RUN \ RUN \
--mount=type=cache,dst=${RUSTUP_HOME},sharing=locked \ --mount=type=cache,dst=${RUSTUP_HOME},sharing=locked \
--mount=type=cache,dst=${CARGO_HOME},sharing=locked \ --mount=type=cache,dst=${CARGO_HOME},sharing=locked \

1
docker/Dockerfile.rocksdb
View File

@@ -42,7 +42,6 @@ RUN \
<<EOF <<EOF
set -eux set -eux
LDFLAGS="-Wl,--strip-all" \
cmake -H. -Bbuild \ cmake -H. -Bbuild \
"-DCMAKE_RULE_MESSAGES:BOOL=${rocksdb_make_rule_messages}" \ "-DCMAKE_RULE_MESSAGES:BOOL=${rocksdb_make_rule_messages}" \
"-DCMAKE_VERBOSE_MAKEFILE:BOOL=${rocksdb_make_verbose}" \ "-DCMAKE_VERBOSE_MAKEFILE:BOOL=${rocksdb_make_verbose}" \

103
docker/bake.hcl
View File

@@ -136,28 +136,50 @@ nightly_rustflags = [
"--allow=unstable-features", "--allow=unstable-features",
"-Zcrate-attr=feature(test)", "-Zcrate-attr=feature(test)",
"-Zenforce-type-length-limit", "-Zenforce-type-length-limit",
#"-Ztime-passes",
#"-Ztime-llvm-passes",
]
static_rustflags = [
"-Crelocation-model=static",
"-Ctarget-feature=+crt-static",
"-Clink-arg=--verbose",
"-Clink-arg=-Wl,--gc-sections",
"-Clink-arg=-L/usr/lib/gcc/x86_64-linux-gnu/14", # FIXME
"-Clink-arg=-l:libstdc++.a",
"-Clink-arg=-l:libc.a",
"-Clink-arg=-l:libm.a",
]
dynamic_rustflags = [
"-Crelocation-model=pic",
"-Ctarget-feature=-crt-static",
"-Clink-arg=--verbose",
"-Clink-arg=-Wl,--gc-sections",
"-Clink-arg=-Wl,--as-needed",
"-Clink-arg=-lstdc++",
"-Clink-arg=-lc",
"-Clink-arg=-lm",
]
static_nightly_rustflags = [
"-Ztls-model=local-exec",
] ]
rmp_rustflags = [ rmp_rustflags = [
"-Ctarget-cpu=native", "-Ctarget-cpu=native",
"-Ztune-cpu=native", "-Ztune-cpu=native",
"-Ctarget-feature=+crt-static",
"-Crelocation-model=static",
"-Ztls-model=local-exec",
"-Zinline-mir=true", "-Zinline-mir=true",
"-Zmir-opt-level=3", "-Zmir-opt-level=3",
"-Clink-arg=-Wl,--gc-sections",
#"-Ztime-passes",
#"-Ztime-llvm-passes",
] ]
rmp_bo_rustflags = [ override_rustflags = [
"-Crelocation-model=pic", "-Crelocation-model=pic",
"-Ctarget-feature=-crt-static", "-Ctarget-feature=-crt-static",
"-Clink-arg=-Wl,--no-gc-sections", "-Clink-arg=-Wl,--no-gc-sections",
] ]
rmp_macro_rustflags = [ macro_rustflags = [
"-Crelocation-model=pic", "-Crelocation-model=pic",
"-Ctarget-feature=-crt-static", "-Ctarget-feature=-crt-static",
] ]
@@ -1054,10 +1076,63 @@ target "deps-base" {
CARGO_PROFILE_bench_CODEGEN_UNITS = "1" CARGO_PROFILE_bench_CODEGEN_UNITS = "1"
CARGO_BUILD_RUSTFLAGS = ( CARGO_BUILD_RUSTFLAGS = (
cargo_profile == "release-max-perf"? cargo_profile == "release-max-perf"?
join(" ", [join(" ", nightly_rustflags), join(" ", rmp_rustflags)]): join(" ", [
join(" ", nightly_rustflags),
contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
"-Clink-arg=-l:libzstd.a": "",
contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
"-Clink-arg=-l:liburing.a": "",
join(" ", static_rustflags),
join(" ", static_nightly_rustflags),
join(" ", rmp_rustflags),
]):
cargo_profile == "release" && rust_toolchain == "nightly"?
join(" ", [
join(" ", nightly_rustflags),
contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
"-Clink-arg=-l:libzstd.a": "",
contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
"-Clink-arg=-l:liburing.a": "",
join(" ", static_rustflags),
join(" ", static_nightly_rustflags),
]):
cargo_profile == "release" || cargo_profile == "release-debuginfo"?
join(" ", [
contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
"-Clink-arg=-l:libzstd.a": "",
contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
"-Clink-arg=-l:liburing.a": "",
join(" ", static_rustflags),
]):
rust_toolchain == "stable"?
join(" ", [
contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
"-Clink-arg=-l:libzstd.a": "",
contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
"-Clink-arg=-l:liburing.a": "",
join(" ", static_rustflags),
]):
rust_toolchain == "nightly"? rust_toolchain == "nightly"?
join(" ", nightly_rustflags): join(" ", [
"" join(" ", nightly_rustflags),
contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
"-Clink-arg=-lzstd": "",
contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
"-Clink-arg=-luring": "",
join(" ", dynamic_rustflags),
]):
join(" ", [
contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
"-Clink-arg=-lzstd": "",
contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
"-Clink-arg=-luring": "",
join(" ", dynamic_rustflags),
])
) )
} }
} }
@@ -1197,9 +1272,9 @@ target "ingredients" {
RUST_BACKTRACE = "full" RUST_BACKTRACE = "full"
ROCKSDB_LIB_DIR="/usr/lib/${sys_target}" ROCKSDB_LIB_DIR="/usr/lib/${sys_target}"
JEMALLOC_OVERRIDE="/usr/lib/${sys_target}/libjemalloc.a" JEMALLOC_OVERRIDE="/usr/lib/${sys_target}/libjemalloc.a"
#ZSTD_SYS_USE_PKG_CONFIG = ( ZSTD_SYS_USE_PKG_CONFIG = (
# contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")? 1: 0 contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")? 1: 0
#) )
} }
} }