chore(merge): 合并 compose Redis 依赖修复
This commit is contained in:
commit
34c775620d
1 file changed
+11
@@ -73,6 +73,9 @@ services:
|
|||||||
SERVER_PORT: "8081"
|
SERVER_PORT: "8081"
|
||||||
# 默认连编排里的 db;要连外部库就在 .env 里覆盖 DB_URL
|
# 默认连编排里的 db;要连外部库就在 .env 里覆盖 DB_URL
|
||||||
DB_URL: ${DB_URL:-jdbc:postgresql://db:5432/${DB_NAME:-fruitshorts}}
|
DB_URL: ${DB_URL:-jdbc:postgresql://db:5432/${DB_NAME:-fruitshorts}}
|
||||||
|
# 限流/缓存用 Redis;容器内 127.0.0.1 是容器自身,必须指向编排里的 redis
|
||||||
|
REDIS_HOST: ${REDIS_HOST:-redis}
|
||||||
|
REDIS_PORT: ${REDIS_PORT:-6379}
|
||||||
ports:
|
ports:
|
||||||
- "8081:8081"
|
- "8081:8081"
|
||||||
volumes:
|
volumes:
|
||||||
@@ -81,6 +84,8 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
redis:
|
||||||
|
condition: service_healthy
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "curl -fsS http://127.0.0.1:8081/healthz || exit 1"]
|
test: ["CMD-SHELL", "curl -fsS http://127.0.0.1:8081/healthz || exit 1"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
@@ -106,6 +111,8 @@ services:
|
|||||||
# 管理端仅内网,页面上直接播放/下载裸媒资地址(不签播放签名),
|
# 管理端仅内网,页面上直接播放/下载裸媒资地址(不签播放签名),
|
||||||
# 因此这里不启用 /files/episode/** 的签名校验;公开的 app-api 仍保持开启。
|
# 因此这里不启用 /files/episode/** 的签名校验;公开的 app-api 仍保持开启。
|
||||||
FRUITSHORTS_MEDIA_PROTECTED_PREFIXES: ""
|
FRUITSHORTS_MEDIA_PROTECTED_PREFIXES: ""
|
||||||
|
REDIS_HOST: ${REDIS_HOST:-redis}
|
||||||
|
REDIS_PORT: ${REDIS_PORT:-6379}
|
||||||
ports:
|
ports:
|
||||||
# docs/12-上线检查清单「管理端仅内网」:只对局域网开放;不在路由器做端口转发,公网访问不到
|
# docs/12-上线检查清单「管理端仅内网」:只对局域网开放;不在路由器做端口转发,公网访问不到
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
@@ -134,12 +141,16 @@ services:
|
|||||||
env_file: .env
|
env_file: .env
|
||||||
environment:
|
environment:
|
||||||
DB_URL: ${DB_URL:-jdbc:postgresql://db:5432/${DB_NAME:-fruitshorts}}
|
DB_URL: ${DB_URL:-jdbc:postgresql://db:5432/${DB_NAME:-fruitshorts}}
|
||||||
|
REDIS_HOST: ${REDIS_HOST:-redis}
|
||||||
|
REDIS_PORT: ${REDIS_PORT:-6379}
|
||||||
volumes:
|
volumes:
|
||||||
# 与两个入口同一个媒资根,否则找不到源文件
|
# 与两个入口同一个媒资根,否则找不到源文件
|
||||||
- ./data/uploads:/data/uploads
|
- ./data/uploads:/data/uploads
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
redis:
|
||||||
|
condition: service_healthy
|
||||||
healthcheck:
|
healthcheck:
|
||||||
# worker 不监听端口(server.port=0),用进程存活判断
|
# worker 不监听端口(server.port=0),用进程存活判断
|
||||||
test: ["CMD-SHELL", "pgrep -f app.jar >/dev/null || exit 1"]
|
test: ["CMD-SHELL", "pgrep -f app.jar >/dev/null || exit 1"]
|
||||||
|
|||||||
Reference in new issue
Block a user