chore: 更新部署配置和文档
- 更新docker-compose.yml配置 - 更新network-config-guide.md网络配置指南 - 更新nginx.conf配置
This commit is contained in:
@@ -159,7 +159,7 @@ services:
|
||||
networks:
|
||||
life-echo-network:
|
||||
external: true
|
||||
name: lifecho_life-echo-network
|
||||
name: api_life-echo-network
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
networks:
|
||||
life-echo-network:
|
||||
external: true
|
||||
name: lifecho_life-echo-network
|
||||
name: api_life-echo-network
|
||||
```
|
||||
|
||||
2. **Life-Echo API 配置**(已更新为使用相同外部网络):
|
||||
@@ -17,7 +17,7 @@ networks:
|
||||
networks:
|
||||
life-echo-network:
|
||||
external: true
|
||||
name: lifecho_life-echo-network
|
||||
name: api_life-echo-network
|
||||
```
|
||||
|
||||
3. **Nginx upstream 配置**(使用服务名):
|
||||
@@ -34,13 +34,13 @@ upstream lifecho_api_backend {
|
||||
首先检查网络是否存在:
|
||||
|
||||
```bash
|
||||
docker network ls | grep lifecho_life-echo-network
|
||||
docker network ls | grep api_life-echo-network
|
||||
```
|
||||
|
||||
如果网络不存在,需要先创建:
|
||||
|
||||
```bash
|
||||
docker network create lifecho_life-echo-network
|
||||
docker network create api_life-echo-network
|
||||
```
|
||||
|
||||
### 2. 启动 Life-Echo 服务
|
||||
@@ -57,7 +57,7 @@ docker-compose up -d
|
||||
|
||||
```bash
|
||||
# 检查网络中的容器
|
||||
docker network inspect lifecho_life-echo-network
|
||||
docker network inspect api_life-echo-network
|
||||
|
||||
# 应该能看到:
|
||||
# - nginx 容器
|
||||
@@ -122,15 +122,15 @@ upstream lifecho_api_backend {
|
||||
|
||||
```bash
|
||||
# 连接现有容器到网络
|
||||
docker network connect lifecho_life-echo-network life-echo-api-prod
|
||||
docker network connect lifecho_life-echo-network life-echo-postgres
|
||||
docker network connect lifecho_life-echo-network life-echo-redis
|
||||
docker network connect lifecho_life-echo-network life-echo-celery-worker
|
||||
docker network connect api_life-echo-network life-echo-api-prod
|
||||
docker network connect api_life-echo-network life-echo-postgres
|
||||
docker network connect api_life-echo-network life-echo-redis
|
||||
docker network connect api_life-echo-network life-echo-celery-worker
|
||||
```
|
||||
|
||||
## 验证清单
|
||||
|
||||
- [ ] 网络 `lifecho_life-echo-network` 存在
|
||||
- [ ] 网络 `api_life-echo-network` 存在
|
||||
- [ ] Life-Echo 服务使用外部网络配置
|
||||
- [ ] Nginx 配置使用服务名 `api:8000`
|
||||
- [ ] 所有容器都在同一网络中
|
||||
|
||||
@@ -52,7 +52,7 @@ http {
|
||||
# - 网络名:life-echo-network
|
||||
# - 端口映射:8000:8000
|
||||
upstream lifecho_api_backend {
|
||||
# nginx 已连接到 lifecho_life-echo-network 网络
|
||||
# nginx 已连接到 api_life-echo-network 网络
|
||||
# 使用服务名 'api' 进行服务发现(推荐)
|
||||
server api:8000;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user