docker: Propagate arguments into the image environment.

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-05-30 21:15:56 +00:00
parent b7d26c0fbf
commit b86d414f28
4 changed files with 28 additions and 6 deletions

View File

@@ -118,7 +118,7 @@ variable "use_chef" {
# Options for output verbosity
variable "BUILDKIT_PROGRESS" {}
variable "CARGO_TERM_VERBOSE" {
default = BUILDKIT_PROGRESS == "plain"? 1: 0
default = BUILDKIT_PROGRESS == "plain"? "true": "false"
}
variable "docker_dir" {
@@ -1195,10 +1195,10 @@ target "ingredients" {
CARGO_TERM_VERBOSE = CI == "true"
RUST_BACKTRACE = "full"
ROCKSDB_LIB_DIR="/usr/lib/${sys_target}"
JEMALLOC_OVERRIDE="/usr/lib/${sys_target}/libjemalloc.so"
ZSTD_SYS_USE_PKG_CONFIG = (
contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")? 1: 0
)
JEMALLOC_OVERRIDE="/usr/lib/${sys_target}/libjemalloc.a"
#ZSTD_SYS_USE_PKG_CONFIG = (
# contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")? 1: 0
#)
}
}