Skip to content

[branch-4.1](docker) pass env options through doris-compose up#64623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hello-stephen merged 2 commits into from
Jul 22, 2026
Merged

[branch-4.1](docker) pass env options through doris-compose up #64623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69256d9
fix(docker): pass env options through doris-compose up
selectdb-robot Jun 18, 2026
3d0255c
Merge branch 'branch-4.1' into ai/doris-26392-compose-env
hello-stephen Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions docker/runtime/doris-compose/cluster.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -453,6 +453,16 @@ def docker_env(self):
elif self.node_type() == Node.TYPE_BE:
envs["LLVM_PROFILE_FILE_PREFIX"] = outfile

user_envs = getattr(self.cluster, "env", [])
if user_envs:
for env in user_envs:
pos = env.find('=')
if pos == -1:
raise Exception(
f"env '{env}' error format, should be like 'name=value'"
)
envs[env[:pos]] = env[pos + 1:]

return envs

def entrypoint(self):
Expand DownExpand Up@@ -885,7 +895,7 @@ class Cluster(object):
def __init__(self, name, subnet, image, is_cloud, is_root_user, fe_config,
be_config, ms_config, recycle_config, remote_master_fe,
local_network_ip, fe_follower, be_disks, be_cluster, reg_be,
extra_hosts, coverage_dir, cloud_store_config,
extra_hosts, env, coverage_dir, cloud_store_config,
sql_mode_node_mgr, be_metaservice_endpoint, be_cluster_id, tde_ak, tde_sk,
tde_aws_ak, tde_aws_sk, tde_aliyun_ak, tde_aliyun_sk,
external_ms_cluster, instance_id, cluster_snapshot="",
Expand All@@ -906,6 +916,7 @@ def __init__(self, name, subnet, image, is_cloud, is_root_user, fe_config,
self.be_cluster = be_cluster
self.reg_be = reg_be
self.extra_hosts = extra_hosts
self.env = env
self.coverage_dir = coverage_dir
self.cloud_store_config = cloud_store_config
self.external_ms_cluster = external_ms_cluster
Expand DownExpand Up@@ -936,7 +947,7 @@ def __init__(self, name, subnet, image, is_cloud, is_root_user, fe_config,
@staticmethod
def new(name, image, is_cloud, is_root_user, fe_config, be_config,
ms_config, recycle_config, remote_master_fe, local_network_ip,
fe_follower, be_disks, be_cluster, reg_be, extra_hosts,
fe_follower, be_disks, be_cluster, reg_be, extra_hosts, env,
coverage_dir, cloud_store_config, sql_mode_node_mgr,
be_metaservice_endpoint, be_cluster_id, tde_ak, tde_sk,
tde_aws_ak, tde_aws_sk, tde_aliyun_ak, tde_aliyun_sk,
Expand All@@ -953,7 +964,7 @@ def new(name, image, is_cloud, is_root_user, fe_config, be_config,
cluster = Cluster(name, subnet, image, is_cloud, is_root_user,
fe_config, be_config, ms_config, recycle_config,
remote_master_fe, local_network_ip, fe_follower,
be_disks, be_cluster, reg_be, extra_hosts,
be_disks, be_cluster, reg_be, extra_hosts, env,
coverage_dir, cloud_store_config,
sql_mode_node_mgr, be_metaservice_endpoint,
be_cluster_id, tde_ak, tde_sk, tde_aws_ak, tde_aws_sk,
Expand Down
14 changes: 12 additions & 2 deletions docker/runtime/doris-compose/command.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -438,6 +438,15 @@ def add_parser(self, args_parsers):
"Add custom host-to-IP mappings (host:ip). For example: --extra-hosts myhost1:192.168.10.1 myhost2:192.168.10.2 . Only use when creating new cluster."
)

parser.add_argument(
"--env",
nargs="*",
type=str,
default=[],
help=
"Add environment variables. For example: --env KEY1=VALUE1 KEY2=VALUE2. Only use when creating new cluster."
)

parser.add_argument(
"--cloud-config",
nargs="*",
Expand DownExpand Up@@ -679,15 +688,16 @@ def run(self, args):

instance_id = getattr(args, 'instance_id', None)
cluster_snapshot = getattr(args, 'cluster_snapshot', '')
env = getattr(args, 'env', []) or []

@wyxxxcatwyxxxcatJul 22, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wyxxxcatwyxxxcatJul 22, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doris: #65142

enable_storage_vault = CLUSTER.is_true(
CLUSTER.get_env_value(args.env, "ENABLE_STORAGE_VAULT"))
CLUSTER.get_env_value(env, "ENABLE_STORAGE_VAULT"))

cluster = CLUSTER.Cluster.new(
args.NAME, args.IMAGE, args.cloud, args.root, args.fe_config,
args.be_config, args.ms_config, args.recycle_config,
args.remote_master_fe, args.local_network_ip, args.fe_follower,
args.be_disks if args.be_disks is not None else ["HDD=1"],
args.be_cluster, args.reg_be, args.extra_hosts,
args.be_cluster, args.reg_be, args.extra_hosts, env,
args.coverage_dir, cloud_store_config, args.sql_mode_node_mgr,
args.be_metaservice_endpoint, args.be_cluster_id, args.tde_ak, args.tde_sk,
args.tde_aws_ak, args.tde_aws_sk, args.tde_aliyun_ak, args.tde_aliyun_sk,
Expand Down
Loading