XEngineers/CamTalk
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: env_file 使用绝对路径 /root/camtalk/.env，确保 CI 容器内 docker compose 正确解析 #161

Merged
huanghaosheng merged 2 commits from develop into v2 2026-06-20 20:58:51 +08:00
Conversation 0 Commits 2 Files Changed 1 +3 -3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 45e2c4f37b - Show all commits

6
docker-compose.yml
View File

@@ -18,7 +18,7 @@ services:
dockerfile: Dockerfile dockerfile: Dockerfile
container_name: camtalk-backend container_name: camtalk-backend
env_file: env_file:
- .env - /root/camtalk/.env
environment: environment:
# 三级存储配置（敏感信息通过 env_file 注入） # 三级存储配置（敏感信息通过 env_file 注入）
- CAMTALK_STORAGE_REDIS_ENABLED=${CAMTALK_STORAGE_REDIS_ENABLED:-true} - CAMTALK_STORAGE_REDIS_ENABLED=${CAMTALK_STORAGE_REDIS_ENABLED:-true}
@@ -38,7 +38,7 @@ services:
image: docker.m.daocloud.io/library/postgres:15-alpine image: docker.m.daocloud.io/library/postgres:15-alpine
container_name: camtalk-postgres container_name: camtalk-postgres
env_file: env_file:
- .env - /root/camtalk/.env
environment: environment:
POSTGRES_DB: camtalk POSTGRES_DB: camtalk
volumes: volumes:
@@ -57,7 +57,7 @@ services:
image: docker.m.daocloud.io/library/redis:7-alpine image: docker.m.daocloud.io/library/redis:7-alpine
container_name: camtalk-redis container_name: camtalk-redis
env_file: env_file:
- .env - /root/camtalk/.env
command: > command: >
sh -c ' sh -c '
if [ -n "$$CAMTALK_REDIS_PASSWORD" ]; then if [ -n "$$CAMTALK_REDIS_PASSWORD" ]; then