From fbf5deda2152286d085c080f748ac5c2aa83e99e Mon Sep 17 00:00:00 2001 From: Han K Date: Tue, 31 Dec 2024 13:46:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(env):=20docker=20compose=20variable=20inter?= =?UTF-8?q?polation=20issue=20for=20COMPOSE=5FPRO=E2=80=A6=20(#12093)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Han Kyaw --- docker/docker-compose.yaml | 1 - docker/generate_docker_compose | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 2697e3eb60..b82659d959 100644 --- a/docker/docker-compose.yaml +++ b/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:-} diff --git a/docker/generate_docker_compose b/docker/generate_docker_compose index dc4460f96c..b5c0acefb1 100755 --- a/docker/generate_docker_compose +++ b/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}:-}}")