浏览代码

fix(env): docker compose variable interpolation issue for COMPOSE_PRO… (#12093)

Co-authored-by: Han Kyaw <hankyaw@Hans-MBP.lan>
tags/0.15.0
Han K 10 个月前
父节点
当前提交
fbf5deda21
没有帐户链接到提交者的电子邮件
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 0
    1
      docker/docker-compose.yaml
  2. 2
    0
      docker/generate_docker_compose

+ 0
- 1
docker/docker-compose.yaml 查看文件

@@ -374,7 +374,6 @@ x-shared-env: &shared-api-worker-env
SSRF_COREDUMP_DIR: ${SSRF_COREDUMP_DIR:-/var/spool/squid}
SSRF_REVERSE_PROXY_PORT: ${SSRF_REVERSE_PROXY_PORT:-8194}
SSRF_SANDBOX_HOST: ${SSRF_SANDBOX_HOST:-sandbox}
COMPOSE_PROFILES: ${COMPOSE_PROFILES:-${VECTOR_STORE:-weaviate}}
EXPOSE_NGINX_PORT: ${EXPOSE_NGINX_PORT:-80}
EXPOSE_NGINX_SSL_PORT: ${EXPOSE_NGINX_SSL_PORT:-443}
POSITION_TOOL_PINS: ${POSITION_TOOL_PINS:-}

+ 2
- 0
docker/generate_docker_compose 查看文件

@@ -37,6 +37,8 @@ def generate_shared_env_block(env_vars, anchor_name="shared-api-worker-env"):
"""
lines = [f"x-shared-env: &{anchor_name}"]
for key, default in env_vars.items():
if key == "COMPOSE_PROFILES":
continue
# If default value is empty, use ${KEY:-}
if default == "":
lines.append(f" {key}: ${{{key}:-}}")

正在加载...
取消
保存