Browse Source
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 months ago
2 changed files with 2 additions and 1 deletions
+ 0
- 1
docker/docker-compose.yaml
View File
| SSRF_COREDUMP_DIR: ${SSRF_COREDUMP_DIR:-/var/spool/squid} | SSRF_COREDUMP_DIR: ${SSRF_COREDUMP_DIR:-/var/spool/squid} | ||||
| SSRF_REVERSE_PROXY_PORT: ${SSRF_REVERSE_PROXY_PORT:-8194} | SSRF_REVERSE_PROXY_PORT: ${SSRF_REVERSE_PROXY_PORT:-8194} | ||||
| SSRF_SANDBOX_HOST: ${SSRF_SANDBOX_HOST:-sandbox} | SSRF_SANDBOX_HOST: ${SSRF_SANDBOX_HOST:-sandbox} | ||||
| COMPOSE_PROFILES: ${COMPOSE_PROFILES:-${VECTOR_STORE:-weaviate}} | |||||
| EXPOSE_NGINX_PORT: ${EXPOSE_NGINX_PORT:-80} | EXPOSE_NGINX_PORT: ${EXPOSE_NGINX_PORT:-80} | ||||
| EXPOSE_NGINX_SSL_PORT: ${EXPOSE_NGINX_SSL_PORT:-443} | EXPOSE_NGINX_SSL_PORT: ${EXPOSE_NGINX_SSL_PORT:-443} | ||||
| POSITION_TOOL_PINS: ${POSITION_TOOL_PINS:-} | POSITION_TOOL_PINS: ${POSITION_TOOL_PINS:-} |
+ 2
- 0
docker/generate_docker_compose
View File
| """ | """ | ||||
| lines = [f"x-shared-env: &{anchor_name}"] | lines = [f"x-shared-env: &{anchor_name}"] | ||||
| for key, default in env_vars.items(): | for key, default in env_vars.items(): | ||||
| if key == "COMPOSE_PROFILES": | |||||
| continue | |||||
| # If default value is empty, use ${KEY:-} | # If default value is empty, use ${KEY:-} | ||||
| if default == "": | if default == "": | ||||
| lines.append(f" {key}: ${{{key}:-}}") | lines.append(f" {key}: ${{{key}:-}}") |
Loading…